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

Unified Diff: ash/ash.gyp

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT 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 | « ash/accelerators/magnifier_key_scroller.cc ('k') | ash/ash_constants.cc » ('j') | 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 de2eb5a31d97ab4d27328a682a5f9098d1660e1d..c463286dce185564d6146313fff761de9d7b3cfb 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -1034,7 +1034,7 @@
'wm/workspace_controller_unittest.cc',
],
'conditions': [
- ['OS=="win"', {
+ ['chromeos==0', {
'sources/': [
# TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
['exclude', 'focus_cycler_unittest.cc'],
« no previous file with comments | « ash/accelerators/magnifier_key_scroller.cc ('k') | ash/ash_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698