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

Unified Diff: ash/ash.gyp

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win64 compile. Created 6 years, 8 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
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index b0b9c6efc7ff1c35201aea92cea89584d14c719e..6837ab2c90ec680b890bcae0211902ebe8b144b7 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -1038,7 +1038,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'],

Powered by Google App Engine
This is Rietveld 408576698