diff options
| author | sky <sky@chromium.org> | 2014-08-23 12:49:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-23 19:51:27 +0000 |
| commit | 7ac4254ef6df0dd3e108dfd35757fc3819a7acba (patch) | |
| tree | a29a911809af0a248b25e3b1f3dc316144b9ec11 /mojo | |
| parent | 929378a002b5756a9f8501e292c157ecedfa36bb (diff) | |
| download | chromium_src-7ac4254ef6df0dd3e108dfd35757fc3819a7acba.zip chromium_src-7ac4254ef6df0dd3e108dfd35757fc3819a7acba.tar.gz chromium_src-7ac4254ef6df0dd3e108dfd35757fc3819a7acba.tar.bz2 | |
Adds necessary dependencies for view_manager tests
Otherwise if you just build mojo_view_manager_unittests on windows
nothing works.
BUG=none
TEST=none
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/501623002
Cr-Commit-Position: refs/heads/master@{#291574}
Diffstat (limited to 'mojo')
| -rw-r--r-- | mojo/mojo_services.gypi | 2 | ||||
| -rw-r--r-- | mojo/services/public/cpp/view_manager/lib/BUILD.gn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi index 54f6e92..981b1c7 100644 --- a/mojo/mojo_services.gypi +++ b/mojo/mojo_services.gypi @@ -757,7 +757,7 @@ 'services/public/cpp/view_manager/lib/view_manager_unittests.cc', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" or OS=="win"', { 'dependencies': [ '../third_party/mesa/mesa.gyp:osmesa', 'mojo_native_viewport_service_lib', diff --git a/mojo/services/public/cpp/view_manager/lib/BUILD.gn b/mojo/services/public/cpp/view_manager/lib/BUILD.gn index 60541ea..e2dc06b9 100644 --- a/mojo/services/public/cpp/view_manager/lib/BUILD.gn +++ b/mojo/services/public/cpp/view_manager/lib/BUILD.gn @@ -17,7 +17,7 @@ source_set("run_unittests") { "//base/test:test_support", "//ui/gl", ] - if (is_linux) { + if (is_linux || is_win) { deps += [ "//third_party/mesa:osmesa", "//mojo/services/native_viewport", |