build/java_apk.gypi - Issue 13145006: Fix proguard enabled condition in dexing step. By definition proguard_enabled flag should use "true…

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 13145006: Fix proguard enabled condition in dexing step. By definition proguard_enabled flag should use "true… (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 bfe8d9c1c3f39008ef7ba0a0199632104776a658..f3ac975438284aa267230d7780236e331602f8e6 100644

--- a/build/java_apk.gypi

+++ b/build/java_apk.gypi

@@ -308,7 +308,7 @@

'message': 'Dexing <(_target_name) jar',

'variables': {

'conditions': [

- ['proguard_enabled==1', {

+ ['proguard_enabled=="true" and CONFIGURATION_NAME=="Release"', {

'dex_inputs': [ '<(obfuscated_jar_path)' ],

'dex_generated_inputs': [],

}, {

« no previous file with comments | « no previous file | no next file » | no next file with comments »