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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 19002008: Revert "Remove dependencies on /media for iOS." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | 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 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 3099 matching lines...) Expand 10 before | Expand all | Expand 10 after
3110 # In gyp, booleans are 0/1 not True/False. 3110 # In gyp, booleans are 0/1 not True/False.
3111 'suppress_wildcard': 1, 3111 'suppress_wildcard': 1,
3112 'type': 'none', 3112 'type': 'none',
3113 'dependencies': [ 3113 'dependencies': [
3114 'automated_ui_tests', 3114 'automated_ui_tests',
3115 '../base/base.gyp:base_unittests', 3115 '../base/base.gyp:base_unittests',
3116 # browser_tests's use of subprocesses chokes gcov on 10.6? 3116 # browser_tests's use of subprocesses chokes gcov on 10.6?
3117 # Disabling for now (enabled on linux/windows below). 3117 # Disabling for now (enabled on linux/windows below).
3118 # 'browser_tests', 3118 # 'browser_tests',
3119 '../ipc/ipc.gyp:ipc_tests', 3119 '../ipc/ipc.gyp:ipc_tests',
3120 '../media/media.gyp:media_unittests',
3120 '../net/net.gyp:net_unittests', 3121 '../net/net.gyp:net_unittests',
3121 '../printing/printing.gyp:printing_unittests', 3122 '../printing/printing.gyp:printing_unittests',
3122 '../remoting/remoting.gyp:remoting_unittests', 3123 '../remoting/remoting.gyp:remoting_unittests',
3123 '../sql/sql.gyp:sql_unittests', 3124 '../sql/sql.gyp:sql_unittests',
3124 '../content/content.gyp:content_unittests', 3125 '../content/content.gyp:content_unittests',
3125 'unit_tests', 3126 'unit_tests',
3126 '../sync/sync.gyp:sync_unit_tests', 3127 '../sync/sync.gyp:sync_unit_tests',
3127 ], # 'dependencies' 3128 ], # 'dependencies'
3128 'conditions': [ 3129 'conditions': [
3129 ['OS!="ios"', {
3130 'dependencies': [
3131 '../media/media.gyp:media_unittests',
3132 ]}],
3133 ['OS=="win"', { 3130 ['OS=="win"', {
3134 'dependencies': [ 3131 'dependencies': [
3135 # Courgette has not been ported from Windows. 3132 # Courgette has not been ported from Windows.
3136 # Note build/win/chrome_win.croc uniquely has the 3133 # Note build/win/chrome_win.croc uniquely has the
3137 # courgette source directory in an include path. 3134 # courgette source directory in an include path.
3138 '../courgette/courgette.gyp:courgette_unittests', 3135 '../courgette/courgette.gyp:courgette_unittests',
3139 'browser_tests', 3136 'browser_tests',
3140 ]}], 3137 ]}],
3141 ['OS=="linux"', { 3138 ['OS=="linux"', {
3142 'dependencies': [ 3139 'dependencies': [
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
3396 'utility', 3393 'utility',
3397 ], 3394 ],
3398 'sources': [ 3395 'sources': [
3399 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3396 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3400 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3397 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3401 ], 3398 ],
3402 }] 3399 }]
3403 }], 3400 }],
3404 ], # 'conditions' 3401 ], # 'conditions'
3405 } 3402 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698