summaryrefslogtreecommitdiffstats
path: root/build/android/gyp
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2016-02-12 12:55:36 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-12 21:04:35 +0000
commite5e26a188da143b498eedf02e7fc8b974bac207d (patch)
treecc9dac05edbe415398e2e4d99aa4a3761a395cbe /build/android/gyp
parentafeae313797716e4729f75dc3455981582155285 (diff)
downloadchromium_src-e5e26a188da143b498eedf02e7fc8b974bac207d.zip
chromium_src-e5e26a188da143b498eedf02e7fc8b974bac207d.tar.gz
chromium_src-e5e26a188da143b498eedf02e7fc8b974bac207d.tar.bz2
Reland #2 of Tweak GN deps of instrumentation apks
Reland of https://codereview.chromium.org/1687723002/ This improves build concurrency a little bit. BUG=none Review URL: https://codereview.chromium.org/1690983002 Cr-Commit-Position: refs/heads/master@{#375252}
Diffstat (limited to 'build/android/gyp')
-rwxr-xr-xbuild/android/gyp/write_build_config.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 9e209f7..baa535d 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -435,7 +435,6 @@ def main(argv):
config['proguard'] = {}
proguard_config = config['proguard']
proguard_config['input_paths'] = [options.jar_path] + java_full_classpath
- proguard_config['tested_apk_info'] = ''
# An instrumentation test apk should exclude the dex files that are in the apk
# under test.
@@ -456,7 +455,6 @@ def main(argv):
if tested_apk_config['proguard_enabled']:
assert proguard_enabled, ('proguard must be enabled for instrumentation'
' apks if it\'s enabled for the tested apk')
- proguard_config['tested_apk_info'] = tested_apk_config['proguard_info']
# Dependencies for the final dex file of an apk or a 'deps_dex'.
if options.type in ['android_apk', 'deps_dex']: