Revert of Create Monochrome-specific repack() targets

chrome/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
-import("//chrome/chrome_paks.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
-import("//tools/resources/generate_resource_whitelist.gni")
 import("channel.gni")
 import("java_sources.gni")
 
 manifest_package = "org.chromium.chrome"
 
 chrome_public_jinja_variables = default_chrome_public_jinja_variables +
                                 [ "manifest_package=$manifest_package" ]
 chrome_public_android_manifest =
     "$target_gen_dir/chrome_public_apk/AndroidManifest.xml"
 chrome_sync_shell_android_manifest =
     "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml"
 
 chrome_sync_shell_jinja_variables =
     default_chrome_public_jinja_variables +
     [ "manifest_package=org.chromium.chrome.sync_shell" ]
 
-if (enable_resource_whitelist_generation) {
-  monochrome_resource_whitelist =
-      "$target_gen_dir/monochrome_resource_whitelist.txt"
-}
-
 jinja_template("chrome_public_android_manifest") {
   input = "java/AndroidManifest.xml"
   output = chrome_public_android_manifest
   variables = chrome_public_jinja_variables
   variables += [
     "min_sdk_version=16",
     "target_sdk_version=23",
   ]
 }
 
@@ skipping 438 matching lines @@
 # Overrides icon / name defined in chrome_java_resources.
 android_resources("chrome_public_apk_resources") {
   resource_dirs = [ "java/res_chromium" ]
 
   # Dep needed to ensure override works properly.
   deps = [
     ":chrome_java_resources",
   ]
 }
 
-# TODO(agrieve): Delete once downstream no longer references this target.
-java_group("chrome_public_apk_assets") {
-  deps = [
-    ":chrome_public_non_pak_assets",
-    ":chrome_public_pak_assets",
-  ]
-}
-
-java_group("chrome_public_non_pak_assets") {
-  deps = [
-    "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
-    "//third_party/icu:icu_assets",
-    "//v8:v8_external_startup_data_assets",
-  ]
-}
-
-android_assets("chrome_public_pak_assets") {
+android_assets("chrome_public_apk_assets") {
   sources = [
     "$root_out_dir/chrome_100_percent.pak",
     "$root_out_dir/resources.pak",
   ]
   disable_compression = true
 
   deps = [
+    "//chrome:packed_extra_resources",
     "//chrome:packed_resources",
     "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
     "//third_party/icu:icu_assets",
     "//v8:v8_external_startup_data_assets",
   ]
 }
 
 jinja_template_resources("chrome_public_apk_template_resources") {
   resources = [
     "java/res_template/xml/chromebackupscheme.xml",
@@ skipping 24 matching lines @@
     "//chrome:chrome_android_core",
   ]
 
   if (is_android && use_order_profiling) {
     deps += [ "//tools/cygprofile" ]
   }
 
   public_configs = extra_chrome_shared_library_configs
 }
 
-if (enable_resource_whitelist_generation) {
-  generate_resource_whitelist("monochrome_resource_whitelist") {
-    deps = [
-      ":monochrome",
-    ]
-    input = "$root_out_dir/libmonochrome$shlib_extension.whitelist"
-    output = monochrome_resource_whitelist
-  }
-}
-
-chrome_paks("monochrome_paks") {
-  output_dir = "$target_gen_dir/$target_name"
-
-  additional_extra_paks = [ "$root_gen_dir/android_webview/aw_resources.pak" ]
-  deps = [
-    "//android_webview:generate_aw_resources",
-  ]
-
-  if (enable_resource_whitelist_generation) {
-    repack_whitelist = monochrome_resource_whitelist
-    deps += [ ":monochrome_resource_whitelist" ]
-  }
-}
-
-java_group("monochrome_assets") {
-  deps = [
-    ":monochrome_pak_assets",
-    "//android_webview:monochrome_webview_assets",
-  ]
-}
-
-android_assets("monochrome_pak_assets") {
-  sources = [
-    "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
-    "$target_gen_dir/monochrome_paks/resources.pak",
-  ]
-  deps = [
-    ":monochrome_paks",
-  ]
-  disable_compression = true
-}
-
 #
 # Only 32-bit //chrome/android/monochrome is needed, beside
 # being built with 32-bit default toolchain, it is also built
 # with secondary 32-bit toolchain in 64-bit platform because we
 # need 64-bit //android_webview/monochrome and 32-bit this target
 # for 64-bit APK.
 if (!android_64bit_target_cpu ||
     current_toolchain == android_secondary_abi_toolchain) {
   shared_library("monochrome") {
     sources = [
@@ skipping 142 matching lines @@
 instrumentation_test_apk("chrome_sync_shell_test_apk") {
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
   ]
   proguard_enabled = !is_java_debug
 }