Commit be9f5401 authored by engedy's avatar engedy Committed by Commit bot

Revert of Make ui/gl depend on the necessary runtime targets on Windows....

Revert of Make ui/gl depend on the necessary runtime targets on Windows. (patchset #3 id:40001 of https://codereview.chromium.org/1070933002/)

Reason for revert:
This CL introduces a typo to the GN build file, so that Windows GN builds fail.

It should be possible to reland after below line is changed from appending to assignment.

ERROR at //ui/gl/BUILD.gn:203:5: Undefined variable for +=.
    data_deps += [
    ^--------
I don't have something with this name in scope now.

See: http://build.chromium.org/p/chromium.win/builders/Win8%20GN

Original issue's description:
> Make ui/gl depend on the necessary runtime targets on Windows.
>
> Committed: https://crrev.com/f4a6e44ff20c29a6410a698a06a45dd11666ef53
> Cr-Commit-Position: refs/heads/master@{#324320}

TBR=brettw@chromium.org,scottmg@chromium.org,jam@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1071113002

Cr-Commit-Position: refs/heads/master@{#324404}
parent df9d9475
......@@ -129,6 +129,14 @@ test("gl_tests") {
deps += [ "//testing/android:native_test_native_code" ]
libs += [ "android" ]
}
# TODO(GYP)
# ['OS == "win"', {
# 'dependencies': [
# '../third_party/angle/src/build_angle.gyp:libEGL',
# '../third_party/angle/src/build_angle.gyp:libGLESv2',
# ],
# }],
}
test("gpu_unittests") {
......
......@@ -199,12 +199,6 @@ component("gl") {
libs = [ "dwmapi.lib" ]
ldflags = [ "/DELAYLOAD:dwmapi.dll" ]
data_deps += [
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/mesa:osmesa",
]
}
if (is_mac) {
sources += [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment