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

Unified Diff: chrome/android/chrome_public_apk_tmpl.gni

Issue 1435343002: GN: Tweak chrome_public_apk_tmpl to allow extra proguard_configs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@proguard-3
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/chrome_public_apk_tmpl.gni
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index 4229b8ea463997145e70678a72e87c38c10f99f0..5a6296c8af68545605493c5f2357b5e71c62edc8 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -17,16 +17,21 @@ declare_args() {
# GYP: //chrome/android/chrome_apk.gypi
template("chrome_public_apk_tmpl") {
- forward_variables_from(invoker, "*")
-
android_apk(target_name) {
+ forward_variables_from(invoker, "*")
_native_lib_file =
rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
if (!is_debug) {
proguard_enabled = true
- proguard_configs = [ "//chrome/android/java/proguard.flags" ]
+ _prev_proguard_configs = []
+ if (defined(proguard_configs)) {
+ _prev_proguard_configs = proguard_configs
+ }
+ proguard_configs = []
+ proguard_configs =
+ [ "//chrome/android/java/proguard.flags" ] + _prev_proguard_configs
}
if (chromium_linker_supported) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698