Move language pak files to assets.

build/config/android/internal_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_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
@@ skipping 212 matching lines @@
           get_label_info(invoker.apk_under_test, "target_gen_dir")
       apk_under_test_name = get_label_info(invoker.apk_under_test, "name")
       apk_under_test_config =
           "$apk_under_test_gen_dir/$apk_under_test_name.build_config"
       args += [
         "--tested-apk-config",
         rebase_path(apk_under_test_config, root_build_dir),
       ]
     }
 
-    if (is_android_assets) {
+    if (is_android_assets || is_apk) {
       if (defined(invoker.asset_sources)) {
         _rebased_asset_sources =
             rebase_path(invoker.asset_sources, root_build_dir)
         args += [ "--asset-sources=$_rebased_asset_sources" ]
       }
       if (defined(invoker.asset_renaming_sources)) {
         _rebased_asset_renaming_sources =
             rebase_path(invoker.asset_renaming_sources, root_build_dir)
         args += [ "--asset-renaming-sources=$_rebased_asset_renaming_sources" ]
 
         # These are zip paths, so no need to rebase.
         args += [ "--asset-renaming-destinations=${invoker.asset_renaming_destinations}" ]
       }
       if (defined(invoker.disable_compression) && invoker.disable_compression) {
         args += [ "--disable-asset-compression" ]
       }
+      if (defined(invoker.is_locale_asset) && invoker.is_locale_asset) {
+        args += [ "--is-locale-asset" ]
+      }
+      if (defined(invoker.has_alternative_locale_asset) &&
+          invoker.has_alternative_locale_asset) {
+        args += [ "--has-alternative-locale-asset" ]
+      }
     }
 
     if (is_android_resources || is_apk) {
       assert(defined(invoker.resources_zip))
       args += [
         "--resources-zip",
         rebase_path(invoker.resources_zip, root_build_dir),
       ]
       if (defined(invoker.android_manifest)) {
         inputs += [ invoker.android_manifest ]
         args += [
           "--android-manifest",
           rebase_path(invoker.android_manifest, root_build_dir),
         ]
       } else {
         assert(!is_apk, "apk build configs require an android_manifest")
       }
       if (defined(invoker.custom_package)) {
         args += [
           "--package-name",
           invoker.custom_package,
         ]
       }
       if (defined(invoker.r_text)) {
         args += [
           "--r-text",
           rebase_path(invoker.r_text, root_build_dir),
         ]
       }
-      if (defined(invoker.is_locale_resource) && invoker.is_locale_resource) {
-        args += [ "--is-locale-resource" ]
-      }
-      if (defined(invoker.has_alternative_locale_resource) &&
-          invoker.has_alternative_locale_resource) {
-        args += [ "--has-alternative-locale-resource" ]
-      }
     }
 
     if (is_android_resources && defined(invoker.resource_dirs)) {
       resource_dirs = rebase_path(invoker.resource_dirs, root_build_dir)
       args += [ "--resource-dirs=$resource_dirs" ]
     }
 
     if (is_apk) {
       if (defined(invoker.shared_libraries_runtime_deps_file)) {
         # Don't list shared_libraries_runtime_deps_file as an input in order to
@@ skipping 2397 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }