Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1458)

Issues Search
    My Issues | Starred     Open | Closed | All

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 import for annotation 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:
View side-by-side diff with in-line comments
Download patch
« build/config/android/config.gni ('K') | « build/config/android/config.gni ('k') | build/config/android/rules.gni » ('j') | chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index ffe5bf37ab578d2910c9f4f244bbdc464b2716ed..0df49175f10873e29c363007fbad33375675d064 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -112,7 +112,11 @@ template("proguard") {
"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,
« build/config/android/config.gni ('K') | « build/config/android/config.gni ('k') | build/config/android/rules.gni » ('j') | chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698