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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 18873009: Revert "Revert "Remove dependencies on /media for iOS."" (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Re-upload patch Created 7 years, 3 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 | « 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 3148 matching lines...) Expand 10 before | Expand all | Expand 10 after
3159 # In gyp, booleans are 0/1 not True/False. 3159 # In gyp, booleans are 0/1 not True/False.
3160 'suppress_wildcard': 1, 3160 'suppress_wildcard': 1,
3161 'type': 'none', 3161 'type': 'none',
3162 'dependencies': [ 3162 'dependencies': [
3163 'automated_ui_tests', 3163 'automated_ui_tests',
3164 '../base/base.gyp:base_unittests', 3164 '../base/base.gyp:base_unittests',
3165 # browser_tests's use of subprocesses chokes gcov on 10.6? 3165 # browser_tests's use of subprocesses chokes gcov on 10.6?
3166 # Disabling for now (enabled on linux/windows below). 3166 # Disabling for now (enabled on linux/windows below).
3167 # 'browser_tests', 3167 # 'browser_tests',
3168 '../ipc/ipc.gyp:ipc_tests', 3168 '../ipc/ipc.gyp:ipc_tests',
3169 '../media/media.gyp:media_unittests',
3170 '../net/net.gyp:net_unittests', 3169 '../net/net.gyp:net_unittests',
3171 '../printing/printing.gyp:printing_unittests', 3170 '../printing/printing.gyp:printing_unittests',
3172 '../remoting/remoting.gyp:remoting_unittests', 3171 '../remoting/remoting.gyp:remoting_unittests',
3173 '../sql/sql.gyp:sql_unittests', 3172 '../sql/sql.gyp:sql_unittests',
3174 '../content/content.gyp:content_unittests', 3173 '../content/content.gyp:content_unittests',
3175 'unit_tests', 3174 'unit_tests',
3176 '../sync/sync.gyp:sync_unit_tests', 3175 '../sync/sync.gyp:sync_unit_tests',
3177 ], # 'dependencies' 3176 ], # 'dependencies'
3178 'conditions': [ 3177 'conditions': [
3178 ['OS!="ios"', {
3179 'dependencies': [
3180 '../media/media.gyp:media_unittests',
3181 ]}],
3179 ['OS=="win"', { 3182 ['OS=="win"', {
3180 'dependencies': [ 3183 'dependencies': [
3181 # Courgette has not been ported from Windows. 3184 # Courgette has not been ported from Windows.
3182 # Note build/win/chrome_win.croc uniquely has the 3185 # Note build/win/chrome_win.croc uniquely has the
3183 # courgette source directory in an include path. 3186 # courgette source directory in an include path.
3184 '../courgette/courgette.gyp:courgette_unittests', 3187 '../courgette/courgette.gyp:courgette_unittests',
3185 'browser_tests', 3188 'browser_tests',
3186 ]}], 3189 ]}],
3187 ['OS=="linux"', { 3190 ['OS=="linux"', {
3188 'dependencies': [ 3191 'dependencies': [
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
3455 'utility', 3458 'utility',
3456 ], 3459 ],
3457 'sources': [ 3460 'sources': [
3458 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3461 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3459 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3462 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3460 ], 3463 ],
3461 }] 3464 }]
3462 }], 3465 }],
3463 ], # 'conditions' 3466 ], # 'conditions'
3464 } 3467 }
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