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

Unified Diff: chrome/chrome_tests.gypi

Issue 1003853005: Remove Chrome OS-only sources only if the OS is Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | chrome/chrome_tests_unit.gypi » ('j') | chrome/chrome_tests_unit.gypi » ('J')
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 fed070ea06bae728c14c72ae11ac5a132bead14e..68dea1a7f25b9aacf8c98de5d7244711a493255c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2157,6 +2157,15 @@
'../build/linux/system.gyp:dbus',
'../ui/login/login.gyp:login_resources',
],
+ 'conditions': [
+ ['use_ozone==1', {
+ 'sources!': [
+ # crbug.com/362698
wtc 2015/03/13 14:09:58 Since bug 362698 has been fixed, perhaps we can ru
kpschoedel 2015/03/13 15:39:57 Yes, good catch.
wtc 2015/03/13 17:43:55 Thanks for confirming. I re-enabled those two test
+ 'browser/chromeos/input_method/input_method_engine_browsertests.cc',
+ 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
+ ],
+ }],
+ ],
}, { # Non-ChromeOS
'sources!': [
'browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc',
@@ -2410,13 +2419,6 @@
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
],
}],
- ['use_ozone==1', {
- 'sources!': [
- # crbug.com/362698
- 'browser/chromeos/input_method/input_method_engine_browsertests.cc',
- 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
- ],
- }],
['remoting==1', {
'sources': [ '<@(chrome_browser_tests_remoting_sources)' ],
'dependencies': [
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | chrome/chrome_tests_unit.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698