Android: Store language .pak files in res/raw rather than assets

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 055e8edad49a8b1f01cc91d9c73d572379e68103..84177a903a473462006f1cc55119bee470517735 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -24,10 +24,23 @@ jinja_variables = [
   "configuration_policy=$configuration_policy",
 ]
 
+chrome_android_paks_gypi =
+    exec_script("//build/gypi_to_gn.py",
+                [ rebase_path("//chrome/chrome_android_paks.gypi") ],

[cjhopman, 2015/06/09 22:35:13]

Can this just add an arg like:

"--replace=<(PRODUCT_DIR)=$root_out_dir" (this might not be quite the correct
replacement)

instead of having to do the double rebase whenever the lists are used?

[agrieve, 2015/06/11 15:34:38]

Much nicer!

+                "scope",
+                [ "//chrome/chrome_android_paks.gypi" ])
+
+locale_pak_resources("chrome_locale_paks") {
+  _gypi_sources = chrome_android_paks_gypi.chrome_android_pak_locale_resources
+  _cleaned_sources = rebase_path(_gypi_sources, "<(PRODUCT_DIR)")
+  sources = rebase_path(_cleaned_sources, ".", root_out_dir)
+}
+
 # GYP: //chrome/chrome.gyp:chrome_java (resources part)
 android_resources("chrome_java_resources") {
   resource_dirs = [ "java/res" ]
   deps = [
+    ":chrome_locale_paks",
     ":chrome_strings_grd",
     "//content/public/android:content_java_resources",
     "//chrome/app:java_strings_grd",
@@ -714,12 +727,6 @@ static_library("chrome_staging") {
 
 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