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

This is a reland of 3e5be326

The source location of pak resources collected for tests has been
updated to match the new location.

TBR=agrieve@chromium.org

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}

Bug: 874584
Change-Id: Ifa3b02a3f87d757435d125eb0c5a15f01d5ca6e1
Reviewed-on: https://chromium-review.googlesource.com/c/1324412Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606462}

build/config/android/internal_rules.gni

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

chrome/BUILD.gn

@@ -1634,25 +1634,27 @@ if (is_chrome_branded && !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
-  }
+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
+    }
 
-  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 && !is_android) {
-    public_deps = [
-      ":default_apps",
-    ]
+    if (is_chrome_branded && !is_mac) {
+      public_deps = [
+        ":default_apps",
+      ]
+    }
   }
 }
 

chrome/android/chrome_public_apk_tmpl.gni

@@ -265,7 +265,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_pak_assets",
+      "//chrome/android:monochrome_apk_pak_assets",
       "//chrome/android/monochrome:monochrome_license_provider_java",
     ]
 

chrome/test/BUILD.gn

@@ -2827,16 +2827,21 @@ test("unit_tests") {
     "//third_party/zlib/google/test/data/",
     "//tools/metrics/histograms/enums.xml",
   ]
-  if (is_android || is_linux || is_win) {
+  if (is_android) {
+    data += [
+      "$root_gen_dir/chrome/android/chrome_apk_paks/chrome_100_percent.pak",
+      "$root_gen_dir/chrome/android/chrome_apk_paks/locales/en-US.pak",
+      "$root_gen_dir/chrome/android/chrome_apk_paks/resources.pak",
+    ]
+  }
+  if (is_linux || is_win) {
     data += [
       "$root_out_dir/chrome_100_percent.pak",
+      "$root_out_dir/chrome_200_percent.pak",
       "$root_out_dir/locales/en-US.pak",
       "$root_out_dir/resources.pak",
     ]
   }
-  if (is_linux || is_win) {
-    data += [ "$root_out_dir/chrome_200_percent.pak" ]
-  }
   if (is_win) {
     data_deps += [ "//chrome" ]
     data += [ "$root_out_dir/chrome.exe" ]
@@ -4145,10 +4150,14 @@ 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" ]