android_webview: Enable ProGuard obfusction

Bug: 855726
Change-Id: I451b9cc0d68982a9cf3deba0af3d7146e8beb14b
Reviewed-on: https://chromium-review.googlesource.com/1114348Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577573}

android_webview/system_webview_apk_tmpl.gni

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//base/android/proguard/proguard.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
@@ -53,8 +54,14 @@ template("system_webview_apk_tmpl") {
         "//android_webview/apk/java/proguard.flags",
         "//base/android/proguard/chromium_apk.flags",
         "//base/android/proguard/chromium_code.flags",
-        "//base/android/proguard/disable_all_obfuscation.flags",
       ]
+      if (enable_proguard_obfuscation) {
+        proguard_configs +=
+            [ "//base/android/proguard/enable_obfuscation.flags" ]
+      } else {
+        proguard_configs +=
+            [ "//base/android/proguard/disable_all_obfuscation.flags" ]
+      }
       png_to_webp = true
     }
     command_line_flags_file = "webview-command-line"

base/android/proguard/proguard.gni

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+  # Controls whether proguard obfuscation is enabled for targets
+  # configured to use it.
+  enable_proguard_obfuscation = true
+}

chrome/android/chrome_public_apk_tmpl.gni

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
+import("//base/android/proguard/proguard.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//build/config/android/extract_unwind_tables.gni")
@@ -13,9 +14,6 @@ import("//third_party/leakcanary/config.gni")
 import("channel.gni")
 
 declare_args() {
-  # Enables ProGuard obfuscation of Chromium packages.
-  enable_proguard_obfuscation = true
-
   # Enable multidex in release builds.
   multidex_in_release = false
 }
@@ -105,7 +103,7 @@ template("chrome_public_apk_tmpl") {
             [ "//base/android/proguard/enable_obfuscation.flags" ]
       } else {
         proguard_configs +=
-            [ "//base/android/proguard/disable_chromium_obfuscation.flags" ]
+            [ "//base/android/proguard/disable_all_obfuscation.flags" ]
       }
     }