Revert of Store only locale paks rather than all assets within BuildConfig.java (patchset #2 id:20001 of https://codereview.chromium.org/2396073002/ )

Reason for revert:
Breaking monochrome (chrome not booting up)

BUG=652984, 653771

Original issue's description:
> Store only locale paks rather than all assets within BuildConfig.java
>
> This works around Monochrome having diffferent BuildConfig.java for
> 32/64 bit.
>
> BUG=652984
>
> Committed: https://crrev.com/4e09dacc10a8a359785c6f49d75653ce7cfd00ec
> Cr-Commit-Position: refs/heads/master@{#423587}

TBR=tedchoc@chromium.org,michaelbai@chromium.org,agrieve@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=652984

Review-Url: https://codereview.chromium.org/2404043002
Cr-Original-Commit-Position: refs/heads/master@{#424304}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 01fbbca601e78b594cebe62b8eb804ca7d6ff0aa

android/gyp/write_build_config.py

@@ -217,11 +217,9 @@ def _CreateJavaLibrariesList(library_paths):
   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 @@ def main(argv):
     }
     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)
 

config/android/rules.gni

@@ -1732,10 +1732,10 @@ if (enable_java_templates) {
           defines += [ "_DCHECK_IS_ON" ]
         }
         defines += [
-          "COMPRESSED_LOCALE_LIST=" +
-              "@FileArg($_rebased_build_config:compressed_locales_java_list)",
-          "UNCOMPRESSED_LOCALE_LIST=" +
-              "@FileArg($_rebased_build_config:uncompressed_locales_java_list)",
+          "COMPRESSED_ASSETS_LIST=" +
+              "@FileArg($_rebased_build_config:compressed_assets_java_list)",
+          "UNCOMPRESSED_ASSETS_LIST=" +
+              "@FileArg($_rebased_build_config:uncompressed_assets_java_list)",
         ]
       }
       _srcjar_deps += [ ":${_template_name}__build_config_java" ]