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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1094903008: Revert of [Android] Add an out-of-app instrumentation driver APK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/android/shell/javatests/AndroidManifest.xml ('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 '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 2918 matching lines...) Expand 10 before | Expand all | Expand 10 after
2929 'dependencies': [ 2929 'dependencies': [
2930 'chrome_java', 2930 'chrome_java',
2931 'chrome_shell_apk_java', 2931 'chrome_shell_apk_java',
2932 'chrome_java_test_support', 2932 'chrome_java_test_support',
2933 '../base/base.gyp:base', 2933 '../base/base.gyp:base',
2934 '../base/base.gyp:base_java_test_support', 2934 '../base/base.gyp:base_java_test_support',
2935 '../components/components.gyp:invalidation_javatests', 2935 '../components/components.gyp:invalidation_javatests',
2936 '../components/components.gyp:precache_javatests', 2936 '../components/components.gyp:precache_javatests',
2937 '../content/content_shell_and_tests.gyp:content_java_test_support', 2937 '../content/content_shell_and_tests.gyp:content_java_test_support',
2938 '../sync/sync.gyp:sync_javatests', 2938 '../sync/sync.gyp:sync_javatests',
2939 '../testing/android/on_device_instrumentation.gyp:broker_java',
2940 '../testing/android/on_device_instrumentation.gyp:require_driver_apk ',
2941 '../ui/android/ui_android.gyp:ui_javatests', 2939 '../ui/android/ui_android.gyp:ui_javatests',
2942 ], 2940 ],
2943 'variables': { 2941 'variables': {
2944 'apk_name': 'ChromeShellTest', 2942 'apk_name': 'ChromeShellTest',
2945 'java_in_dir': 'android/shell/javatests', 2943 'java_in_dir': 'android/shell/javatests',
2946 'additional_src_dirs': ['android/javatests/src'], 2944 'additional_src_dirs': ['android/javatests/src'],
2947 'is_test_apk': 1, 2945 'is_test_apk': 1,
2948 }, 2946 },
2949 'includes': [ '../build/java_apk.gypi' ], 2947 'includes': [ '../build/java_apk.gypi' ],
2950 }, 2948 },
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
3240 ['enable_webrtc==1', { 3238 ['enable_webrtc==1', {
3241 'dependencies': [ 3239 'dependencies': [
3242 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3240 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3243 ] 3241 ]
3244 }], 3242 }],
3245 ], 3243 ],
3246 }] 3244 }]
3247 }], 3245 }],
3248 ], # 'conditions' 3246 ], # 'conditions'
3249 } 3247 }
OLDNEW
« no previous file with comments | « chrome/android/shell/javatests/AndroidManifest.xml ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698