From 7ac4254ef6df0dd3e108dfd35757fc3819a7acba Mon Sep 17 00:00:00 2001 From: sky Date: Sat, 23 Aug 2014 12:49:18 -0700 Subject: 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} --- mojo/mojo_services.gypi | 2 +- mojo/services/public/cpp/view_manager/lib/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mojo') 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", -- cgit v1.1