build/android/gyp/write_build_config.py - Issue 1692383002: Revert of Make instrumentation_test_apk depend on their apk_under_test.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/gyp/write_build_config.py

Issue 1692383002: Revert of Make instrumentation_test_apk depend on their apk_under_test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dist-jar

Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

Index: build/android/gyp/write_build_config.py

diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py

index 0960f63f6448bb8e4a3bea302a46195230928a0d..e86f8c09bdef2bca051c4fc31479d2a068e6b8c7 100755

--- a/build/android/gyp/write_build_config.py

+++ b/build/android/gyp/write_build_config.py

@@ -423,6 +423,7 @@

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.

@@ -443,6 +444,7 @@

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']:

« no previous file with comments | « no previous file | build/config/android/internal_rules.gni » ('j') | no next file with comments »