Revert "Android: Unify pak resource generation for Chrome and Monochrome"

This reverts commit 3e5be326.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Android: Unify pak resource generation for Chrome and Monochrome
> 
> Previously, Monochrome used its own set of GN targets to package
> resources, analogous to the ones used for Chrome (some of which are the
> same used for non-Android platforms).  This change moves both variants
> to use matching sets of template-generated targets.
> 
> Later, when bundle-specific native libraries are added, this common
> template can be reused again.
> 
> BUG=874584
> 
> Change-Id: Ia9c34cb0dfa8754207bdee146dbde47f9aca78d3
> Reviewed-on: https://chromium-review.googlesource.com/c/1318418
> Commit-Queue: Christopher Grant <cjgrant@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#606060}

TBR=digit@chromium.org,cjgrant@chromium.org,agrieve@chromium.org

Change-Id: I6737ffb2f74ba75b46060f30cf571e67f0a051af
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 874584
Reviewed-on: https://chromium-review.googlesource.com/c/1324107Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606138}

build/config/android/internal_rules.gni

@@ -38,7 +38,10 @@ _java_target_whitelist = [
 ]
 
 # Targets that match the whitelist but are not actually java targets.
-_java_target_blacklist = [ "*:*_unpack_aar" ]
+_java_target_blacklist = [
+  "//chrome:packed_resources",
+  "*:*_unpack_aar",
+]
 
 _default_proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
 

chrome/BUILD.gn

@@ -1634,27 +1634,25 @@ if (is_chrome_branded && !is_android) {
   }
 }
 
-if (!is_android) {
-  chrome_paks("packed_resources") {
-    if (is_mac) {
-      output_dir = "$root_gen_dir/repack"
-      copy_data_to_bundle = true
-    } else {
-      output_dir = root_out_dir
-    }
+chrome_paks("packed_resources") {
+  if (is_mac) {
+    output_dir = "$root_gen_dir/repack"
+    copy_data_to_bundle = true
+  } else {
+    output_dir = root_out_dir
+  }
 
-    if (enable_resource_whitelist_generation) {
-      repack_whitelist = chrome_resource_whitelist
-      deps = [
-        "//chrome:resource_whitelist",
-      ]
-    }
+  if (enable_resource_whitelist_generation) {
+    repack_whitelist = chrome_resource_whitelist
+    deps = [
+      "//chrome:resource_whitelist",
+    ]
+  }
 
-    if (is_chrome_branded && !is_mac) {
-      public_deps = [
-        ":default_apps",
-      ]
-    }
+  if (is_chrome_branded && !is_mac && !is_android) {
+    public_deps = [
+      ":default_apps",
+    ]
   }
 }
 

chrome/android/chrome_public_apk_tmpl.gni

@@ -264,7 +264,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
       "//android_webview/apk:webview_license_activity_java",
       "//android_webview/glue",
       "//chrome/android:chrome_public_non_pak_assets",
-      "//chrome/android:monochrome_apk_pak_assets",
+      "//chrome/android:monochrome_pak_assets",
       "//chrome/android/monochrome:monochrome_license_provider_java",
     ]
 

chrome/test/BUILD.gn

@@ -4145,14 +4145,10 @@ test("unit_tests") {
   }
   if (!is_mac) {
     deps += [
+      "//chrome:packed_resources",
       "//chrome/tools/convert_dict:lib",
       "//third_party/hunspell",
     ]
-    if (is_android) {
-      deps += [ "//chrome/android:chrome_apk_paks" ]
-    } else {
-      deps += [ "//chrome:packed_resources" ]
-    }
   }
   if (is_win || is_mac || is_chromeos) {
     sources += [ "../browser/extensions/api/networking_private/networking_private_crypto_unittest.cc" ]