| 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)) {
|
|
|