Revert of Move language pak files to assets.

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")
@@ skipping 48 matching lines @@
 jinja_template("chrome_sync_shell_android_manifest") {
   input = "java/AndroidManifest.xml"
   output = chrome_sync_shell_android_manifest
   variables = chrome_sync_shell_jinja_variables
   variables += [
     "min_sdk_version=16",
     "target_sdk_version=22",
   ]
 }
 
-locale_pak_assets("chrome_locale_pak") {
+locale_pak_resources("chrome_locale_paks") {
   sources = [
     "$root_out_dir/locales/am.pak",
     "$root_out_dir/locales/ar.pak",
     "$root_out_dir/locales/bg.pak",
     "$root_out_dir/locales/ca.pak",
     "$root_out_dir/locales/cs.pak",
     "$root_out_dir/locales/da.pak",
     "$root_out_dir/locales/de.pak",
     "$root_out_dir/locales/el.pak",
     "$root_out_dir/locales/en-GB.pak",
@@ skipping 38 matching lines @@
     "//chrome:packed_resources",
   ]
 }
 
 android_resources("chrome_java_resources") {
   resource_dirs = [
     "java/res",
     "//chrome/android/java/res_chromium",
   ]
   deps = [
+    ":chrome_locale_paks",
     ":chrome_strings_grd",
     "//chrome/app:java_strings_grd",
     "//components/policy:app_restrictions_resources",
     "//components/strings:components_locale_settings_grd",
     "//components/strings:components_strings_grd",
     "//content/public/android:content_java_resources",
     "//third_party/android_data_chart:android_data_chart_java_resources",
     "//third_party/android_media:android_media_resources",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
@@ skipping 117 matching lines @@
 
   # Manifest used for linting (determining unused resources).
   android_manifest = chrome_public_android_manifest
 
   # TODO(sievers): Split java code into components. Not everything
   # is really all that UI related here.
   if (android_java_ui) {
     # From java_sources.gni.
     java_files = chrome_java_sources
 
-    # Allow downstream targets to specify their own locale pak files.
-    jar_excluded_patterns += [ "*/LocalePakFiles.class" ]
-
     srcjar_deps += [
-      ":chrome_locale_pak_srcjar",
       "//chrome:page_info_connection_type_javagen",
       "//chrome:website_settings_action_javagen",
       "//components/browsing_data/core:browsing_data_utils_java",
       "//components/infobars/core:infobar_enums_java",
       "//components/ntp_snippets:ntp_snippets_java_enums_srcjar",
       "//components/ntp_tiles:ntp_tiles_enums_java",
       "//components/offline_pages:offline_page_model_enums_java",
       "//components/omnibox/browser:autocomplete_match_javagen",
       "//components/omnibox/browser:autocomplete_match_type_javagen",
       "//components/security_state:security_state_enums_java",
@@ skipping 388 matching lines @@
     "//components/sync:test_support_sync_fake_server_android",
   ]
 }
 
 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk
 template("chrome_public_apk_tmpl_shared") {
   chrome_public_apk_tmpl(target_name) {
     forward_variables_from(invoker, "*")
 
     native_lib_version_rule = "//build/util:chrome_version_json"
-    srcjar_deps = [ ":chrome_locale_pak_srcjar" ]
+
     deps += [
       ":chrome_java",
-      ":chrome_locale_pak_assets",
       ":chrome_public_apk_assets",
       ":chrome_public_apk_resources",
       "//base:base_java",
     ]
   }
 }
 
 chrome_public_apk_tmpl_shared("chrome_public_apk") {
   android_manifest = chrome_public_android_manifest
   android_manifest_dep = ":chrome_public_android_manifest"
@@ skipping 84 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
 }