build/java.gypi - Issue 1292313004: Update usage of Proguard in clank after moving Proguard to third_party.

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

Issue 1292313004: Update usage of Proguard in clank after moving Proguard to third_party. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert changes in progard.flags Created 5 years, 4 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.gypi

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

index 614d50a101d492f6ce77718a08f22675a6458dac..9a90c3f2279dc2d7b23e286a2abfeee21bc6f5b9 100644

--- a/build/java.gypi

+++ b/build/java.gypi

@@ -202,7 +202,7 @@

'action_name': 'proguard_<(_target_name)',

'message': 'Proguard preprocessing <(_target_name) jar',

'inputs': [

- '<(android_sdk_root)/tools/proguard/lib/proguard.jar',

+ '<(DEPTH)/third_party/proguard/lib/proguard.jar',

'<(DEPTH)/build/android/gyp/util/build_utils.py',

'<(DEPTH)/build/android/gyp/proguard.py',

'<(javac_jar_path)',

@@ -213,7 +213,7 @@

'action': [

'python', '<(DEPTH)/build/android/gyp/proguard.py',

- '--proguard-path=<(android_sdk_root)/tools/proguard/lib/proguard.jar',

+ '--proguard-path=<(DEPTH)/third_party/proguard/lib/proguard.jar',

'--input-path=<(javac_jar_path)',

'--output-path=<(jar_path)',

'--proguard-config=<(proguard_config)',

« build/android/pylib/instrumentation/test_jar.py ('K') | « build/config/android/internal_rules.gni ('k') | build/java_apk.gypi » ('j') | no next file with comments »