build/java_prebuilt.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_prebuilt.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: jbudorick@'s 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_prebuilt.gypi

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

index 8efc4ef7f4d17aa153368c6b931b103be966aa6a..a3271bf05a4105454cdd89d63a75208edf923993 100644

--- a/build/java_prebuilt.gypi

+++ b/build/java_prebuilt.gypi

@@ -63,7 +63,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',

'<(jar_path)',

@@ -74,7 +74,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=<(jar_path)',

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

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

« no previous file with comments | « build/java_apk.gypi ('k') | no next file » | no next file with comments »