build/config/android/internal_rules.gni - Issue 2031033002: Adding option for Proguard jar to be switched.

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 2031033002: Adding option for Proguard jar to be switched. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed single newline Created 4 years, 6 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:

Index: build/config/android/internal_rules.gni

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

index 9432260c00793cdee7e1a872a3ba9e326f0d305a..0b9fa9d12400a017bf48db6fb98a71dcf85ddcb0 100644

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

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

@@ -539,7 +539,11 @@ if (enable_java_templates) {

"testonly",

])

script = "//build/android/gyp/proguard.py"

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

+ if (defined(invoker.proguard_jar_path)) {

+ _proguard_jar_path = invoker.proguard_jar_path

+ } else {

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

+ }

_output_jar_path = invoker.output_jar_path

inputs = [

_proguard_jar_path,

« no previous file with comments | « build/config/android/config.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »