diff options
| author | jam <jam@chromium.org> | 2015-04-09 08:20:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-09 15:21:23 +0000 |
| commit | d7e993a0783684e4ccb06460394dda23b8600191 (patch) | |
| tree | 48d8d13a169302a08c2c7ed3acd75da6c368f123 | |
| parent | 5d4cb56c54bc7b56c88808c1db07cf295fff6fad (diff) | |
| download | chromium_src-d7e993a0783684e4ccb06460394dda23b8600191.zip chromium_src-d7e993a0783684e4ccb06460394dda23b8600191.tar.gz chromium_src-d7e993a0783684e4ccb06460394dda23b8600191.tar.bz2 | |
Make ui/gl depend on the necessary runtime targets on Windows.
Committed: https://crrev.com/f4a6e44ff20c29a6410a698a06a45dd11666ef53
Cr-Commit-Position: refs/heads/master@{#324320}
Review URL: https://codereview.chromium.org/1070933002
Cr-Commit-Position: refs/heads/master@{#324445}
| -rw-r--r-- | gpu/BUILD.gn | 8 | ||||
| -rw-r--r-- | ui/gl/BUILD.gn | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index eba5e7a..259df32 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -129,14 +129,6 @@ 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") { diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn index f36138a..efee0ee 100644 --- a/ui/gl/BUILD.gn +++ b/ui/gl/BUILD.gn @@ -199,6 +199,12 @@ 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 += [ |