Revert of Android: Store language .pak files in res/raw rather than 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/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("channel.gni")
 
 manifest_package = "org.chromium.chrome"
 if (enable_configuration_policy) {
   configuration_policy = 1
 } else {
   configuration_policy = 0
 }
 
 jinja_variables = [
   "channel=$android_channel",
   "manifest_package=$manifest_package",
   "configuration_policy=$configuration_policy",
 ]
 
-chrome_android_paks_gypi =
-    exec_script("//build/gypi_to_gn.py",
-                [
-                  rebase_path("//chrome/chrome_android_paks.gypi"),
-                  "--replace=<(PRODUCT_DIR)=$root_out_dir",
-                ],
-                "scope",
-                [ "//chrome/chrome_android_paks.gypi" ])
-
-locale_pak_resources("chrome_locale_paks") {
-  sources = chrome_android_paks_gypi.chrome_android_pak_locale_resources
-}
-
 # GYP: //chrome/chrome.gyp:chrome_java (resources part)
 android_resources("chrome_java_resources") {
   resource_dirs = [
     "java/res",
     "java/res_default",
   ]
   deps = [
-    ":chrome_locale_paks",
     ":chrome_strings_grd",
     "//content/public/android:content_java_resources",
     "//chrome/app:java_strings_grd",
     "//third_party/android_data_chart:android_data_chart_java_resources",
     "//third_party/android_media:android_media_resources",
     "//third_party/android_tools:android_support_v7_appcompat_resources",
   ]
   custom_package = "org.chromium.chrome"
 }
 
@@ skipping 191 matching lines @@
   resource_dirs = [ "shell/res" ]
   custom_package = "org.chromium.chrome.shell"
 }
 
 # GYP: N/A
 android_library("chrome_shell_java") {
   testonly = true
   deps = [
     ":chrome_shell_resources",
     ":chrome_java",
-    ":chrome_java_resources",
     "//base:base_java",
     "//content/public/android:content_java",
     "//components/dom_distiller/android:dom_distiller_content_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/service_tab_launcher:service_tab_launcher_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//printing:printing_java",
     "//net/android:net_java",
     "//sync/android:sync_java",
     "//third_party/android_tools:android_support_v13_java",
@@ skipping 455 matching lines @@
   libs = [
     "android",
     "jnigraphics",
   ]
 
   defines = []
 }
 
 chrome_public_apk_assets_dir = "$root_build_dir/chrome_public_apk_assets"
 
+chrome_android_paks_gypi =
+    exec_script("//build/gypi_to_gn.py",
+                [ rebase_path("//chrome/chrome_android_paks.gypi") ],
+                "scope",
+                [ "//chrome/chrome_android_paks.gypi" ])
+
 copy_ex("chrome_public_apk_assets") {
   clear_dir = true
   dest = chrome_public_apk_assets_dir
-  sources = chrome_android_paks_gypi.chrome_android_pak_input_resources
+  gypi_sources = chrome_android_paks_gypi.chrome_android_pak_input_resources
+  cleaned_sources = rebase_path(gypi_sources, "<(PRODUCT_DIR)")
+  sources = rebase_path(cleaned_sources, ".", root_out_dir)
   if (icu_use_data_file) {
     sources += [ "$root_build_dir/icudtl.dat" ]
   }
   deps = [
     "//chrome:packed_extra_resources",
     "//chrome:packed_resources",
     "//third_party/icu:icudata",
   ]
 
   if (v8_use_external_startup_data) {
@@ skipping 90 matching lines @@
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/test/android:chrome_staging_test_support_java",
     "//chrome/android:chrome_staging_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }