Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3838)

Unified Diff: ash/ash.gyp

Issue 287013005: Don't depend on (empty) chromeos-only display target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 0b0f11a63b9d7dde72d2f6f27db27db9945b9289..aa8ab77ec991e6f10edf90f1a915be48ae61cc5a 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -1205,7 +1205,6 @@
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../ui/accessibility/accessibility.gyp:ax_gen',
- '../ui/display/display.gyp:display',
'ash_shell_lib',
'ash_test_support',
],
@@ -1213,6 +1212,13 @@
'shell/window_watcher_unittest.cc',
'test/ash_unittests.cc',
],
+ 'conditions': [
+ ['chromeos==1', {
+ 'dependencies': [
+ '../ui/display/display.gyp:display',
+ ],
+ }],
+ ],
},
],
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698