Reland "Android: Move chromium_code/apk.flags to base_java"

Fixed:
- Removed -assume for Logger since it breaks cronet.

Much of the r8/proguard flags in
base/android/proguard/chromium_{apk,code}.flags relates to
org.chromium.base java files. Thus it makes sense to co-locate the flags
file with the java library target containing those files, i.e.
//base:base_java

Cq-Include-Trybots: luci.chromium.try:android-cronet-asan-arm-rel,android-cronet-x86-rel-kitkat-tests
Bug: 1038372, 1358080
Change-Id: I7de53558db6a3c34f0ea4a83c6842c7f49daa463
Fixed: 1358080
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3866318
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Owners-Override: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1041651}

android_webview/system_webview_apk_tmpl.gni

@@ -273,11 +273,8 @@ template("system_webview_apk_or_module_tmpl") {
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
-      proguard_configs += [
-        "//android_webview/nonembedded/java/proguard.flags",
-        "//base/android/proguard/chromium_apk.flags",
-        "//base/android/proguard/chromium_code.flags",
-      ]
+      proguard_configs +=
+          [ "//android_webview/nonembedded/java/proguard.flags" ]
       png_to_webp = true
     }
 

base/BUILD.gn

@@ -4315,6 +4315,11 @@ if (is_android) {
     annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
     resources_package = "org.chromium.base"
+
+    proguard_configs = [
+      "android/proguard/chromium_apk.flags",
+      "android/proguard/chromium_code.flags",
+    ]
   }
 
   android_aidl("base_java_aidl") {

base/android/proguard/chromium_apk.flags

@@ -70,24 +70,6 @@
   static boolean isLoggable(...);
 }
 
--assumenosideeffects class java.util.logging.Logger {
-    void finest(...);
-    void finer(...);
-    void fine(...);
-    void info(...);
-    void warning(...);
-    void severe(...);
-    void throwing(...);
-    void log(...);
-    void logp(...);
-    static java.util.logging.Logger getLogger(...) return null;
-    boolean isLoggable(...) return false;
-}
-
--assumenosideeffects class java.util.logging.Level {
-  int intValue() return 0;
-}
-
 # Makes try-with-resources less inefficient. Saved 3.8kb when added.
 -assumenosideeffects class java.lang.Throwable {
   void addSuppressed(...);

chrome/android/chrome_public_apk_tmpl.gni

@@ -290,11 +290,7 @@ template("chrome_public_common_apk_or_module_tmpl") {
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
-      proguard_configs += [
-        "//chrome/android/proguard/main.flags",
-        "//base/android/proguard/chromium_apk.flags",
-        "//base/android/proguard/chromium_code.flags",
-      ]
+      proguard_configs += [ "//chrome/android/proguard/main.flags" ]
     }
 
     if (use_chromium_linker) {

chrome/android/expectations/monochrome_public_bundle.proguard_flags.expected

@@ -170,24 +170,6 @@
   static boolean isLoggable(...);
 }
 
--assumenosideeffects class java.util.logging.Logger {
-    void finest(...);
-    void finer(...);
-    void fine(...);
-    void info(...);
-    void warning(...);
-    void severe(...);
-    void throwing(...);
-    void log(...);
-    void logp(...);
-    static java.util.logging.Logger getLogger(...) return null;
-    boolean isLoggable(...) return false;
-}
-
--assumenosideeffects class java.util.logging.Level {
-  int intValue() return 0;
-}
-
 # Makes try-with-resources less inefficient. Saved 3.8kb when added.
 -assumenosideeffects class java.lang.Throwable {
   void addSuppressed(...);

chrome/android/webapk/libs/runtime_library/BUILD.gn

@@ -52,11 +52,7 @@ android_library("runtime_library_for_tests_java") {
 dist_dex("webapk_runtime_library") {
   deps = [ ":runtime_library_for_assets_java" ]
   proguard_enabled = true
-  proguard_configs = [
-    "runtime_library.proguard.flags",
-    "//base/android/proguard/chromium_code.flags",
-    "//base/android/proguard/chromium_apk.flags",
-  ]
+  proguard_configs = [ "runtime_library.proguard.flags" ]
   output = "$target_out_dir/$runtime_library_dex_asset_name"
 }
 

chrome/android/webapk/shell_apk/BUILD.gn

@@ -285,8 +285,6 @@ template("webapk_tmpl") {
       proguard_configs = [
         "//chrome/android/webapk/shell_apk/proguard.flags",
         "//chrome/android/proguard/main.flags",
-        "//base/android/proguard/chromium_apk.flags",
-        "//base/android/proguard/chromium_code.flags",
       ]
     }
   }

components/cronet/android/BUILD.gn

@@ -489,7 +489,6 @@ android_apk("cronet_sample_apk") {
     proguard_configs = [
       "$target_gen_dir/cronet_impl_native_proguard.cfg",
       "cronet_impl_common_proguard.cfg",
-      "//base/android/proguard/chromium_apk.flags",
     ]
   }
 }
@@ -1229,7 +1228,6 @@ if (!is_component_build) {
         "$target_gen_dir/cronet_impl_native_proguard.cfg",
         "cronet_impl_common_proguard.cfg",
         "test/proguard.cfg",
-        "//base/android/proguard/chromium_apk.flags",
         "//testing/android/proguard_for_test.flags",
       ]
       enable_proguard_checks = false

remoting/android/remoting_apk_tmpl.gni

@@ -19,11 +19,7 @@ template("remoting_apk_tmpl") {
       if (!defined(proguard_configs)) {
         proguard_configs = []
       }
-      proguard_configs += [
-        "//remoting/android/proguard.flags",
-        "//base/android/proguard/chromium_apk.flags",
-        "//base/android/proguard/chromium_code.flags",
-      ]
+      proguard_configs += [ "//remoting/android/proguard.flags" ]
     }
 
     android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"