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

Unified Diff: chrome/chrome_tests.gypi

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reupload to try off of ToT instead of LKGR 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 | « chrome/chrome_browser_ui.gypi ('k') | chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a7e0aa7bfbc0b9c9783d1531a9f67546d43e1f7c..fbd990ab6763b32d4469793fe06a4c32e618b033 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1792,10 +1792,20 @@
],
}],
],
+ }, { # else: OS != "win"
+ 'sources!': [
+ 'app/chrome_command_ids.h',
+ 'app/chrome_dll.rc',
+ 'app/chrome_dll_resource.h',
+ 'app/chrome_version.rc.version',
+ ],
+ }],
+ ['chromeos==0 and use_aura==1', {
'sources!': [
- # use_aura currently sets use_ash on Windows. So take these tests out
- # for win aura builds.
- # TODO: enable these for win_ash browser tests.
+ # On Windows and Linux, we currently don't support enough of the
+ # ash environment to run these unit tests.
+ #
+ # TODO: enable these on windows and linux.
'browser/chromeos/system/tray_accessibility_browsertest.cc',
'browser/ui/ash/accelerator_commands_browsertest.cc',
'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
@@ -1804,13 +1814,6 @@
'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc',
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
],
- }, { # else: OS != "win"
- 'sources!': [
- 'app/chrome_command_ids.h',
- 'app/chrome_dll.rc',
- 'app/chrome_dll_resource.h',
- 'app/chrome_version.rc.version',
- ],
}],
['OS=="linux"', {
'dependencies': [
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698