Revert of Move language pak files to assets.

build/config/android/rules.gni

 # 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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/toolchain/toolchain.gni")
@@ skipping 589 matching lines @@
     }
 
     group(target_name) {
       public_deps = [
         ":${target_name}__build_config",
         ":${target_name}__template",
       ]
     }
   }
 
+  # Creates a resources.zip with locale.pak files placed into appropriate
+  # resource configs (e.g. en-GB.pak -> res/raw-en/en_gb.pak). Also generates
+  # a locale_paks TypedArray so that resource files can be enumerated at runtime.
+  #
+  # If this target is included in the deps of an android resources/library/apk,
+  # the resources will be included with that target.
+  #
+  # Variables:
+  #   sources: List of .pak files. Names must be of the form "en.pak" or
+  #       "en-US.pak".
+  #   deps: (optional) List of dependencies that might be needed to generate
+  #       the .pak files.
+  #
+  # Example
+  #   locale_pak_resources("locale_paks") {
+  #     sources = [ "path/en-US.pak", "path/fr.pak", ... ]
+  #   }
+  template("locale_pak_resources") {
+    set_sources_assignment_filter([])
+    assert(defined(invoker.sources))
+
+    _base_path = "$target_gen_dir/$target_name"
+    _resources_zip = _base_path + ".resources.zip"
+    _build_config = _base_path + ".build_config"
+
+    write_build_config("${target_name}__build_config") {
+      build_config = _build_config
+      resources_zip = _resources_zip
+      type = "android_resources"
+      is_locale_resource = true
+    }
+
+    action("${target_name}__create_resources_zip") {
+      forward_variables_from(invoker,
+                             [
+                               "deps",
+                               "sources",
+                             ])
+      script = "//build/android/gyp/locale_pak_resources.py"
+      depfile = "$target_gen_dir/$target_name.d"
+
+      outputs = [
+        _resources_zip,
+      ]
+
+      _rebased_sources = rebase_path(sources, root_build_dir)
+      args = [
+        "--locale-paks=${_rebased_sources}",
+        "--resources-zip",
+        rebase_path(_resources_zip, root_build_dir),
+        "--depfile",
+        rebase_path(depfile, root_build_dir),
+      ]
+    }
+
+    group(target_name) {
+      public_deps = [
+        ":${target_name}__build_config",
+        ":${target_name}__create_resources_zip",
+      ]
+    }
+  }
+
   # Declare an Android resources target
   #
   # This creates a resources zip file that will be used when building an Android
   # library or apk and included into a final apk.
   #
   # To include these resources in a library/apk, this target should be listed in
   # the library's deps. A library/apk will also include any resources used by its
   # own dependencies.
   #
   # Variables
@@ skipping 519 matching lines @@
   #       "*/FooService.class", "*/FooService\$*.class"
   #     ]
   #   }
   template("java_library") {
     set_sources_assignment_filter([])
     java_library_impl(target_name) {
       forward_variables_from(invoker, "*")
     }
   }
 
-  # Creates android assets for locale pak files and a srcjar with a java class
-  # containing the pak file paths so that they can be extracted as necessary.
-  #
-  # Variables:
-  #   sources: List of .pak files. Names must be of the form "en.pak" or
-  #       "en-US.pak".
-  #
-  # Example
-  #   locale_pak_assets("chrome_locale_pak") {
-  #     sources = [ "path/en-US.pak", "path/fr.pak", ... ]
-  #   }
-  #
-  #   android_assets("chrome_public_apk_assets") {
-  #     deps = [ "chrome_locale_pak_assets" ]
-  #   }
-  #
-  #   chrome_public_apk_tmpl(target_name) {
-  #     srcjar_deps = [ "chrome_locale_pak_srcjar" ]
-  #   }
-  template("locale_pak_assets") {
-    set_sources_assignment_filter([])
-
-    action("${target_name}_srcjar") {
-      _output_path = "$target_gen_dir/$target_name.srcjar"
-      _target = get_label_info(":$target_name", "label_no_toolchain")
-
-      forward_variables_from(invoker,
-                             [
-                               "deps",
-                               "sources",
-                             ])
-      script = "//build/android/gyp/locale_pak_assets.py"
-      depfile = "$target_gen_dir/$target_name.d"
-      _rebased_sources = rebase_path(sources, root_build_dir)
-
-      outputs = [
-        _output_path,
-      ]
-
-      args = [
-        "--locale-paks=${_rebased_sources}",
-        "--srcjar",
-        rebase_path(_output_path, root_build_dir),
-        "--depfile",
-        rebase_path(depfile, root_build_dir),
-        "--target",
-        _target,
-      ]
-    }
-
-    android_assets("${target_name}_assets") {
-      forward_variables_from(invoker,
-                             [
-                               "sources",
-                               "disable_compression",
-                             ])
-    }
-  }
-
   # Declare a java library target for a prebuilt jar
   #
   # Variables
   #   deps: Specifies the dependencies of this target. Java targets in this list
   #     will be added to the javac classpath.
   #   jar_path: Path to the prebuilt jar.
   #   jar_dep: Target that builds jar_path (optional).
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
@@ skipping 208 matching lines @@
   #     dependencies will also be included in the apk (e.g. for is_component_build).
   #   native_lib_placeholders: List of placeholder filenames to add to the apk
   #     (optional).
   #   apk_under_test: For an instrumentation test apk, this is the target of the
   #     tested apk.
   #   include_all_resources - If true include all resource IDs in all generated
   #     R.java files.
   #   testonly: Marks this target as "test-only".
   #   write_asset_list: Adds an extra file to the assets, which contains a list of
   #     all other asset files.
+  #   alternative_locale_resource_dep: The locale resource target which overrides
+  #     any exsting locale resources in dep graph.
   #   requires_sdk_api_level_23: If defined and true, the apk is intended for
   #     installation only on Android M or later. In these releases the system
   #     linker does relocation unpacking, so we can enable it unconditionally.
   #   secondary_native_libs (deprecated): The path of native libraries for secondary
   #     app abi.
   #   run_findbugs_override: Forces run_findbugs on or off. If undefined, the
   #     default will use the build arg run_findbugs.
   #   proguard_jar_path: The path to proguard.jar you wish to use. If undefined,
   #     the proguard used will be the checked in one in //third_party/proguard.
   #
@@ skipping 212 matching lines @@
       resources_zip = resources_zip_path
       build_config = _build_config
       android_manifest = _android_manifest
 
       deps = _android_manifest_deps
 
       if (defined(invoker.deps)) {
         possible_config_deps = invoker.deps
       }
 
+      if (defined(invoker.alternative_locale_resource_dep)) {
+        possible_config_deps += [ invoker.alternative_locale_resource_dep ]
+        has_alternative_locale_resource = true
+      }
+
       # Added emma to the target's classpath via its .build_config.
       if (emma_coverage && !_emma_never_instrument) {
         possible_config_deps += [ "//third_party/android_tools:emma_device" ]
       }
 
       proguard_enabled = _proguard_enabled
       if (_proguard_enabled) {
         proguard_info = "$_proguard_output_jar_path.info"
       }
 
@@ skipping 30 matching lines @@
       zip_path = resources_zip_path
       all_resources_zip_path = _all_resources_zip_path
       generate_constant_ids = true
       proguard_file = _generated_proguard_config
 
       build_config = _build_config
       deps = _android_manifest_deps + [ ":$build_config_target" ]
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
+      if (defined(invoker.alternative_locale_resource_dep)) {
+        deps += [ invoker.alternative_locale_resource_dep ]
+      }
     }
     _srcjar_deps += [ ":$process_resources_target" ]
 
     if (_native_libs_deps != []) {
       _enable_chromium_linker_tests = false
       if (defined(invoker.enable_chromium_linker_tests)) {
         _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
       }
       _ordered_libraries_json =
           "$target_gen_dir/$target_name.ordered_libararies.json"
@@ skipping 1078 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }