Revert of Store only locale paks rather than all assets within BuildConfig.java

build/android/gyp/write_build_config.py

Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 8f4580eaa6d113fd86683fbd2a8dcdda9aabacf8..50379f2947c54df13a2c23213c2d92b4176d783b 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -217,11 +217,9 @@
   return ('{%s}' % ','.join(['"%s"' % s[3:-3] for s in library_paths]))
 
 
-def _CreateLocalePaksAssetJavaList(assets):
+def _CreateJavaAssetList(assets):
   """Returns a java literal array from a list of assets in the form src:dst."""
-  names_only = (a.split(':')[1][:-4] for a in assets if a.endswith('.pak'))
-  locales_only = (a for a in names_only if '-' in a or len(a) == 2)
-  return '{%s}' % ','.join(sorted('"%s"' % a for a in locales_only))
+  return '{%s}' % ','.join(sorted(['"%s"' % a.split(':')[1] for a in assets]))
 
 
 def main(argv):
@@ -646,10 +644,10 @@
     }
     config['assets'], config['uncompressed_assets'] = (
         _MergeAssets(deps.All('android_assets')))
-    config['compressed_locales_java_list'] = (
-        _CreateLocalePaksAssetJavaList(config['assets']))
-    config['uncompressed_locales_java_list'] = (
-        _CreateLocalePaksAssetJavaList(config['uncompressed_assets']))
+    config['compressed_assets_java_list'] = (
+        _CreateJavaAssetList(config['assets']))
+    config['uncompressed_assets_java_list'] = (
+        _CreateJavaAssetList(config['uncompressed_assets']))
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)