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

Side by Side 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: Remove the workaround for bug 362698. 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 2392 matching lines...) Expand 10 before | Expand all | Expand 10 after
2403 'renderer/safe_browsing/phishing_classifier_browsertest.cc', 2403 'renderer/safe_browsing/phishing_classifier_browsertest.cc',
2404 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc' , 2404 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc' ,
2405 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.c c', 2405 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.c c',
2406 ] 2406 ]
2407 }], 2407 }],
2408 ['enable_autofill_dialog!=1 or OS=="android" or OS=="ios"', { 2408 ['enable_autofill_dialog!=1 or OS=="android" or OS=="ios"', {
2409 'dependencies!': [ 2409 'dependencies!': [
2410 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput' , 2410 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput' ,
2411 ], 2411 ],
2412 }], 2412 }],
2413 ['use_ozone==1', {
2414 'sources!': [
2415 # crbug.com/362698
2416 'browser/chromeos/input_method/input_method_engine_browsertests.cc',
2417 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
2418 ],
2419 }],
2420 ['remoting==1', { 2413 ['remoting==1', {
2421 'sources': [ '<@(chrome_browser_tests_remoting_sources)' ], 2414 'sources': [ '<@(chrome_browser_tests_remoting_sources)' ],
2422 'dependencies': [ 2415 'dependencies': [
2423 '../remoting/remoting.gyp:remoting_webapp', 2416 '../remoting/remoting.gyp:remoting_webapp',
2424 ] 2417 ]
2425 }], 2418 }],
2426 ['use_x11==1', { 2419 ['use_x11==1', {
2427 'dependencies': [ 2420 'dependencies': [
2428 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2421 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2429 ], 2422 ],
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
3173 ['enable_webrtc==1', { 3166 ['enable_webrtc==1', {
3174 'dependencies': [ 3167 'dependencies': [
3175 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3168 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3176 ] 3169 ]
3177 }], 3170 }],
3178 ], 3171 ],
3179 }] 3172 }]
3180 }], 3173 }],
3181 ], # 'conditions' 3174 ], # 'conditions'
3182 } 3175 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698