| 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 78cd4cb46cd1e7c338f5f9c243f73c6a04f7c4ff..8c664aa49c192c5f455810ec3e3d82ae3e0a3731 100644 | 
| --- a/chrome/android/chrome_public_apk_tmpl.gni | 
| +++ b/chrome/android/chrome_public_apk_tmpl.gni | 
| @@ -52,8 +52,11 @@ template("chrome_public_apk_tmpl") { | 
| "//chrome/android/java/proguard.flags", | 
| "//base/android/base_proguard_config.flags", | 
| ] | 
| -      if (!enable_all_proguard_optimizations) { | 
| -        proguard_configs += [ "//testing/android/proguard_for_test.flags" ] | 
| +      if (enable_all_proguard_optimizations) { | 
| +        proguard_configs += | 
| +            [ "//chrome/android/java/proguard_for_release.flags" ] | 
| +      } else { | 
| +        proguard_configs += [ "//testing/android/proguard_under_test.flags" ] | 
| } | 
| } | 
|  | 
|  |