build/config/android/internal_rules.gni - 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/config/android/internal_rules.gni

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/config/android/internal_rules.gni

diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni

index f92d4ba0cfdf3932ea7e0f41cf3367c70d5b5db2..2898a6b6f152241442ea79e7ba5cf4f47a384761 100644

--- a/build/config/android/internal_rules.gni

+++ b/build/config/android/internal_rules.gni

@@ -417,7 +417,7 @@ template("process_java_prebuilt") {

assert(invoker.build_config != "")

if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {

- _proguard_jar_path = "$android_sdk_root/tools/proguard/lib/proguard.jar"

+ _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"

_proguard_config_path = invoker.proguard_config

_build_config = invoker.build_config

_rebased_build_config = rebase_path(_build_config, root_build_dir)

« no previous file with comments | « build/android/pylib/utils/proguard.py ('k') | build/java.gypi » ('j') | no next file with comments »