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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 22865003: Add dependency on android_tools in java_apk.gypi for all test apks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the dependency to java_apk.gypi. Created 7 years, 4 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 | « build/java_apk.gypi ('k') | content/content_tests.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 3253 matching lines...) Expand 10 before | Expand all | Expand 10 after
3264 { 3264 {
3265 'target_name': 'chromium_testshell_test_apk', 3265 'target_name': 'chromium_testshell_test_apk',
3266 'type': 'none', 3266 'type': 'none',
3267 'dependencies': [ 3267 'dependencies': [
3268 'chrome_java', 3268 'chrome_java',
3269 'chromium_testshell_java', 3269 'chromium_testshell_java',
3270 '../base/base.gyp:base', 3270 '../base/base.gyp:base',
3271 '../base/base.gyp:base_java_test_support', 3271 '../base/base.gyp:base_java_test_support',
3272 '../content/content.gyp:content_java_test_support', 3272 '../content/content.gyp:content_java_test_support',
3273 '../sync/sync.gyp:sync_javatests', 3273 '../sync/sync.gyp:sync_javatests',
3274 '../tools/android/forwarder/forwarder.gyp:forwarder',
3275 ], 3274 ],
3276 'variables': { 3275 'variables': {
3277 'apk_name': 'ChromiumTestShellTest', 3276 'apk_name': 'ChromiumTestShellTest',
3278 'java_in_dir': 'android/testshell/javatests', 3277 'java_in_dir': 'android/testshell/javatests',
3279 'resource_dir': 'android/testshell/res', 3278 'resource_dir': 'android/testshell/res',
3280 'additional_src_dirs': ['android/javatests/src'], 3279 'additional_src_dirs': ['android/javatests/src'],
3281 'is_test_apk': 1, 3280 'is_test_apk': 1,
3282 }, 3281 },
3283 'includes': [ '../build/java_apk.gypi' ], 3282 'includes': [ '../build/java_apk.gypi' ],
3284 }, 3283 },
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
3411 'utility', 3410 'utility',
3412 ], 3411 ],
3413 'sources': [ 3412 'sources': [
3414 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3413 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3415 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3414 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3416 ], 3415 ],
3417 }] 3416 }]
3418 }], 3417 }],
3419 ], # 'conditions' 3418 ], # 'conditions'
3420 } 3419 }
OLDNEW
« no previous file with comments | « build/java_apk.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698