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

Unified Diff: chrome/android/chrome_public_apk_tmpl.gni

Issue 2295363002: 🔔 Allow android_* targets to specify proguard flags for apks (Closed)
Patch Set: Created 4 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: 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 fb39884c3c0873bff87086901f734519350b68d3..eda782673485f0f74a259504bce0f11d953b6f39 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -44,20 +44,14 @@ template("chrome_public_apk_tmpl") {
enable_multidex = true
} else {
proguard_enabled = true
- _prev_proguard_configs = []
- if (defined(proguard_configs)) {
- _prev_proguard_configs = proguard_configs
- }
- proguard_configs = []
- proguard_configs = _prev_proguard_configs + [
- "//chrome/android/java/proguard.flags",
- "//base/android/base_proguard_config.flags",
- "//base/android/release_proguard_config.flags",
- ]
- if (enable_webvr || enable_vr_shell) {
- proguard_configs +=
- [ "//third_party/gvr-android-sdk/proguard/base.flags" ]
+ if (!defined(proguard_configs)) {
+ proguard_configs = []
}
+ proguard_configs += [
+ "//chrome/android/java/proguard.flags",
+ "//base/android/base_proguard_config.flags",
+ "//base/android/release_proguard_config.flags",
+ ]
}
if (!defined(use_chromium_linker)) {

Powered by Google App Engine
This is Rietveld 408576698