build/java_apk.gypi - Issue 12913017: Support multiple proguard flags from java_apk.gypi. Proguard supports multiple proguard configurati…

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/java_apk.gypi

Issue 12913017: Support multiple proguard flags from java_apk.gypi. Proguard supports multiple proguard configurati… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 7 years, 9 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/java_apk.gypi

diff --git a/build/java_apk.gypi b/build/java_apk.gypi

index 0a1122df582aabcafe88d1caa745347c1e0e2405..a5a5563820ed56f767c494c55825870660f02dff 100644

--- a/build/java_apk.gypi

+++ b/build/java_apk.gypi

@@ -59,7 +59,7 @@

'app_manifest_version_name%': '<(android_app_version_name)',

'app_manifest_version_code%': '<(android_app_version_code)',

'proguard_enabled%': 'false',

- 'proguard_flags_path%': '<(DEPTH)/build/android/empty_proguard.flags',

+ 'proguard_flags_paths%': ['<(DEPTH)/build/android/empty_proguard.flags'],

'native_libs_paths': [],

'jar_name': 'chromium_apk_<(_target_name).jar',

'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',

@@ -346,7 +346,7 @@

'<(DEPTH)/build/android/ant/apk-obfuscate.xml',

'<(DEPTH)/build/android/ant/create-test-jar.js',

'<(compile_stamp)',

- '<(proguard_flags_path)',

+ '>@(proguard_flags_paths)',

'outputs': [

'<(obfuscate_stamp)',

@@ -367,7 +367,7 @@

'-DOBFUSCATED_JAR_PATH=<(obfuscated_jar_path)',

'-DOUT_DIR=<(intermediate_dir)',

'-DPROGUARD_ENABLED=<(proguard_enabled)',

- '-DPROGUARD_FLAGS=<(proguard_flags_path)',

+ '-DPROGUARD_FLAGS=<(proguard_flags_paths)',

'-DTEST_JAR_PATH=<(PRODUCT_DIR)/test.lib.java/<(apk_name).jar',

'-DSTAMP=<(obfuscate_stamp)',

« no previous file with comments | « build/android/tests/multiple_proguards/src/dummy/DummyActivity.java ('k') | no next file » | no next file with comments »