Move //chrome/android proguard configs into a separate directory

There are enough of them now that I think it makes sense to split them
out.

Bug: None
Change-Id: I503872e8877fc5f623e87550f5acab3b7d8a3650
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302490
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789528}

chrome/android/BUILD.gn

@@ -2253,7 +2253,7 @@ template("chrome_test_apk_tmpl") {
     }
     if (!is_java_debug) {
       proguard_enabled = true
-      proguard_configs = [ "//chrome/android/java/apk_for_test.flags" ]
+      proguard_configs = [ "//chrome/android/proguard/apk_for_test.flags" ]
     }
 
     # TODO(crbug.com/993340): Update test goldens with webp versions of images.
@@ -2305,7 +2305,7 @@ template("monochrome_test_apk_tmpl") {
         proguard_configs = []
       }
       proguard_enabled = true
-      proguard_configs += [ "//chrome/android/java/apk_for_test.flags" ]
+      proguard_configs += [ "//chrome/android/proguard/apk_for_test.flags" ]
     }
   }
 }

chrome/android/chrome_public_apk_tmpl.gni

@@ -320,7 +320,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
         proguard_configs = []
       }
       proguard_configs += [
-        "//chrome/android/java/proguard.flags",
+        "//chrome/android/proguard/main.flags",
         "//base/android/proguard/chromium_apk.flags",
         "//base/android/proguard/chromium_code.flags",
       ]

chrome/android/expectations/monochrome_public_bundle.proguard_flags.expected

@@ -331,7 +331,7 @@
 }
 
 ################################################################################
-# ../../chrome/android/java/proguard.flags
+# ../../chrome/android/proguard/main.flags
 ################################################################################
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be

chrome/android/java/OWNERS

-per-file *.flags=smaier@chromium.org
 per-file *.grd*=twellington@chromium.org

chrome/android/proguard/OWNERS

+agrieve@chromium.org
+smaier@chromium.org
+
+# Team: build@chromium.org

chrome/android/trichrome.gni

@@ -185,11 +185,11 @@ template("trichrome_library_apk_tmpl") {
       proguard_configs = [
         "//base/android/proguard/chromium_apk.flags",
         "//base/android/proguard/chromium_code.flags",
-        "//chrome/android/java/trichrome.flags",
+        "//chrome/android/proguard/trichrome.flags",
       ]
       if (trichrome_synchronized_proguard) {
         proguard_configs += [
-          "//chrome/android/java/static_library_dex_reference_workarounds.flags",
+          "//chrome/android/proguard/static_library_dex_reference_workarounds.flags",
           "//base/android/proguard/enable_obfuscation.flags",
         ]
       } else {

chrome/android/webapk/shell_apk/BUILD.gn

@@ -253,7 +253,7 @@ template("webapk_tmpl") {
       proguard_enabled = true
       proguard_configs = [
         "//chrome/android/webapk/shell_apk/proguard.flags",
-        "//chrome/android/java/proguard.flags",
+        "//chrome/android/proguard/main.flags",
         "//base/android/proguard/chromium_apk.flags",
         "//base/android/proguard/chromium_code.flags",
       ]

chrome/test/android/BUILD.gn

@@ -75,7 +75,7 @@ instrumentation_test_apk("chrome_java_test_pagecontroller_tests") {
 
   if (!is_java_debug) {
     proguard_enabled = true
-    proguard_configs = [ "//chrome/android/java/apk_for_test.flags" ]
+    proguard_configs = [ "//chrome/android/proguard/apk_for_test.flags" ]
   }
 }
 
@@ -107,7 +107,7 @@ instrumentation_test_apk("chrome_java_test_wpr_tests") {
 
   if (!is_java_debug) {
     proguard_enabled = true
-    proguard_configs = [ "//chrome/android/java/apk_for_test.flags" ]
+    proguard_configs = [ "//chrome/android/proguard/apk_for_test.flags" ]
   }
 }
 
@@ -133,7 +133,7 @@ instrumentation_test_apk("chrome_java_test_webapk_launch_tests") {
 
   if (!is_java_debug) {
     proguard_enabled = true
-    proguard_configs = [ "//chrome/android/java/apk_for_test.flags" ]
+    proguard_configs = [ "//chrome/android/proguard/apk_for_test.flags" ]
   }
 }
 
@@ -151,7 +151,7 @@ instrumentation_test_apk("chrome_java_test_pagecontroller_codelab") {
 
   if (!is_java_debug) {
     proguard_enabled = true
-    proguard_configs = [ "//chrome/android/java/apk_for_test.flags" ]
+    proguard_configs = [ "//chrome/android/proguard/apk_for_test.flags" ]
   }
 }