Reland of Move language pak files to assets.

Reverted by:
https://codereview.chromium.org/2369683002/

Reason for reland:
I've reworked it so that:
1. The list of pak files to extract are not set on start-up, but rather lazy initialized
2. This is done by putting the list of locale assets right in base's BuildConfig.java
3. Downstream parts have been upstreams so that this won't require a 2-sided patch

Language pak files were moved to res/raw when split apks was being implemented.
Moving them to assets with a java constant keeping track of pak file locations
will improve lookup time and save some space (no more xml files and
resources.arsc).

Other notables:
- .pak filenames no longer mangled. No more .lpak. no more hyphens to _s
- Ensures that monochrome doesn't extract files by extracting only when
files are compressed.

BUG=529604

Review-Url: https://codereview.chromium.org/2371843002
Cr-Commit-Position: refs/heads/master@{#422836}

android_webview/BUILD.gn

@@ -53,7 +53,8 @@ webview_repack_locales("repack_locales") {
   }
 }
 
-locale_pak_resources("locale_paks") {
+android_assets("locale_pak_assets") {
+  disable_compression = true
   sources = []
   foreach(_locale, locales) {
     sources += [ "$root_out_dir/android_webview/locales/$_locale.pak" ]
@@ -135,6 +136,7 @@ android_assets("monochrome_webview_assets") {
 
 android_assets("assets") {
   deps = [
+    ":locale_pak_assets",
     ":monochrome_webview_assets",
     ":pak_file_assets",
   ]
@@ -164,7 +166,6 @@ android_resources("resources") {
   resource_dirs = [ "java/res" ]
   custom_package = "org.chromium.android_webview"
   deps = [
-    ":locale_paks",
     ":strings_grd",
   ]
 }

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

@@ -48,7 +48,6 @@ import org.chromium.android_webview.AwResource;
 import org.chromium.android_webview.AwServiceWorkerController;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.HttpAuthDatabase;
-import org.chromium.android_webview.R;
 import org.chromium.android_webview.ResourcesContextWrapperFactory;
 import org.chromium.base.BuildConfig;
 import org.chromium.base.CommandLine;
@@ -64,7 +63,6 @@ import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.content.browser.ContentViewStatics;
 import org.chromium.net.NetworkChangeNotifier;
-import org.chromium.ui.base.ResourceBundle;
 
 import java.io.File;
 import java.util.Queue;
@@ -393,7 +391,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
         final String webViewPackageName = WebViewFactory.getLoadedPackageInfo().packageName;
         Context context = ContextUtils.getApplicationContext();
         setUpResources(webViewPackageName, context);
-        ResourceBundle.initializeLocalePaks(context, R.array.locale_paks);
         initPlatSupportLibrary();
         initNetworkChangeNotifier(context);
         final int extraBindFlags = Context.BIND_EXTERNAL_SERVICE;

android_webview/system_webview_apk_tmpl.gni

@@ -24,7 +24,6 @@ template("system_webview_apk_tmpl") {
     _native_lib_file =
         rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
     native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
-    extensions_to_not_compress = ".lpak,.pak,.bin,.dat"
     if (build_apk_secondary_abi && android_64bit_target_cpu) {
       secondary_abi_shared_libraries = [ "//android_webview:libwebviewchromium($android_secondary_abi_toolchain)" ]
     }

android_webview/test/BUILD.gn

@@ -20,6 +20,7 @@ android_apk("android_webview_apk") {
     ":android_webview_apk_assets",
     ":android_webview_apk_resources",
     "//android_webview:android_webview_java",
+    "//android_webview:locale_pak_assets",
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/policy/android:policy_java_test_support",
@@ -51,8 +52,6 @@ android_apk("android_webview_apk") {
   _native_lib_file =
       rebase_path("$root_gen_dir/CHROME_VERSION.json", root_build_dir)
   native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
-
-  extensions_to_not_compress = ".dat,.bin,.pak,.lpak"
 }
 
 android_resources("android_webview_apk_resources") {

android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java

@@ -4,11 +4,9 @@
 
 package org.chromium.android_webview.shell;
 
-import org.chromium.android_webview.R;
 import org.chromium.base.CommandLine;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.content.app.ContentApplication;
-import org.chromium.ui.base.ResourceBundle;
 
 /**
  * The android_webview shell Application subclass.
@@ -18,16 +16,6 @@ public class AwShellApplication extends ContentApplication {
         super(false /* mShouldInitializeApplicationStatusTracking */);
     }
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    @Override
-    protected void initializeLibraryDependencies() {
-        ResourceBundle.initializeLocalePaks(this, R.array.locale_paks);
-    }
-
     @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
     @Override
     public void initCommandLine() {

base/android/java/src/org/chromium/base/LocaleUtils.java

@@ -19,14 +19,23 @@ public class LocaleUtils {
     }
 
     /**
-     * @return the string for the given locale, translating
-     * Android deprecated language codes into the modern ones
-     * used by Chromium.
+     * @return The string for the given locale, translating Android deprecated language codes
+     *         into the modern ones used by Chromium.
      */
     public static String getLocale(Locale locale) {
-        String language = locale.getLanguage();
+        String language = getLanguage(locale);
         String country = locale.getCountry();
 
+        return country.isEmpty() ? language : language + "-" + country;
+    }
+
+    /**
+     * @return The language for the given locale, translating Android deprecated languages codes
+     *         into modern ones used by Chromium.
+     */
+    public static String getLanguage(Locale locale) {
+        String language = locale.getLanguage();
+
         // Android uses deprecated lanuages codes for Hebrew and Indonesian but Chromium uses the
         // updated codes. Also, Android uses "tl" while Chromium uses "fil" for Tagalog/Filipino.
         // So apply a mapping.
@@ -38,12 +47,12 @@ public class LocaleUtils {
         } else if ("tl".equals(language)) {
             language = "fil";
         }
-        return country.isEmpty() ? language : language + "-" + country;
+        return language;
     }
 
     /**
-     * @return the default locale, translating Android deprecated
-     * language codes into the modern ones used by Chromium.
+     * @return The default locale, translating Android deprecated language codes into the modern
+     *         ones used by Chromium.
      */
     @CalledByNative
     public static String getDefaultLocale() {
@@ -51,8 +60,7 @@ public class LocaleUtils {
     }
 
     /**
-     * Get the default country code set during install.
-     * @return country code.
+     * @return The default country code set during install.
      */
     @CalledByNative
     private static String getDefaultCountryCode() {

base/android/java/src/org/chromium/base/ResourceExtractor.java

@@ -4,7 +4,6 @@
 
 package org.chromium.base;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -12,8 +11,6 @@ import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 
-import org.chromium.base.annotations.SuppressFBWarnings;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -21,6 +18,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 
@@ -35,23 +33,7 @@ public class ResourceExtractor {
     private static final String V8_NATIVES_DATA_FILENAME = "natives_blob.bin";
     private static final String V8_SNAPSHOT_DATA_FILENAME = "snapshot_blob.bin";
     private static final String APP_VERSION_PREF = "org.chromium.base.ResourceExtractor.Version";
-
-    private static ResourceEntry[] sResourcesToExtract = new ResourceEntry[0];
-
-    /**
-     * Holds information about a res/raw file (e.g. locale .pak files).
-     */
-    public static final class ResourceEntry {
-        public final int resourceId;
-        public final String pathWithinApk;
-        public final String extractedFileName;
-
-        public ResourceEntry(int resourceId, String pathWithinApk, String extractedFileName) {
-            this.resourceId = resourceId;
-            this.pathWithinApk = pathWithinApk;
-            this.extractedFileName = extractedFileName;
-        }
-    }
+    private static final String FALLBACK_LOCALE = "en-US";
 
     private class ExtractTask extends AsyncTask<Void, Void, Void> {
         private static final int BUFFER_SIZE = 16 * 1024;
@@ -107,16 +89,16 @@ public class ResourceExtractor {
             TraceEvent.begin("WalkAssets");
             byte[] buffer = new byte[BUFFER_SIZE];
             try {
-                for (ResourceEntry entry : sResourcesToExtract) {
-                    File output = new File(outputDir, entry.extractedFileName);
+                for (String assetName : mAssetsToExtract) {
+                    File output = new File(outputDir, assetName);
                     // TODO(agrieve): It would be better to check that .length == expectedLength.
                     //     http://crbug.com/606413
                     if (output.length() != 0) {
                         continue;
                     }
                     TraceEvent.begin("ExtractResource");
-                    InputStream inputStream = mContext.getResources().openRawResource(
-                            entry.resourceId);
+                    InputStream inputStream =
+                            ContextUtils.getApplicationContext().getAssets().open(assetName);
                     try {
                         extractResourceHelper(inputStream, output, buffer);
                     } finally {
@@ -128,7 +110,7 @@ public class ResourceExtractor {
                 // Try to recover here, can we try again after deleting files instead of
                 // returning null? It might be useful to gather UMA here too to track if
                 // this happens with regularity.
-                Log.w(TAG, "Exception unpacking required pak resources: %s", e.getMessage());
+                Log.w(TAG, "Exception unpacking required pak asset: %s", e.getMessage());
                 deleteFiles();
                 return;
             } finally {
@@ -166,10 +148,11 @@ public class ResourceExtractor {
 
         /** Returns a number that is different each time the apk changes. */
         private long getApkVersion() {
-            PackageManager pm = mContext.getPackageManager();
+            PackageManager pm = ContextUtils.getApplicationContext().getPackageManager();
             try {
                 // More appropriate would be versionCode, but it doesn't change while developing.
-                PackageInfo pi = pm.getPackageInfo(mContext.getPackageName(), 0);
+                PackageInfo pi =
+                        pm.getPackageInfo(ContextUtils.getApplicationContext().getPackageName(), 0);
                 return pi.lastUpdateTime;
             } catch (PackageManager.NameNotFoundException e) {
                 throw new RuntimeException(e);
@@ -177,31 +160,38 @@ public class ResourceExtractor {
         }
     }
 
-    private final Context mContext;
     private ExtractTask mExtractTask;
+    private final String[] mAssetsToExtract = detectFilesToExtract();
 
     private static ResourceExtractor sInstance;
 
-    public static ResourceExtractor get(Context context) {
+    public static ResourceExtractor get() {
         if (sInstance == null) {
-            sInstance = new ResourceExtractor(context);
+            sInstance = new ResourceExtractor();
         }
         return sInstance;
     }
 
-    /**
-     * Specifies the files that should be extracted from the APK.
-     * and moved to {@link #getOutputDir()}.
-     */
-    @SuppressFBWarnings("EI_EXPOSE_STATIC_REP2")
-    public static void setResourcesToExtract(ResourceEntry[] entries) {
-        assert (sInstance == null || sInstance.mExtractTask == null)
-                : "Must be called before startExtractingResources is called";
-        sResourcesToExtract = entries;
+    private static boolean isPakFileForLanguage(String pakFileName, String language) {
+        if (pakFileName.length() <= language.length() || !pakFileName.startsWith(language)) {
+            return false;
+        }
+        char c = pakFileName.charAt(language.length());
+        return c == '.' || c == '-';
     }
 
-    private ResourceExtractor(Context context) {
-        mContext = context.getApplicationContext();
+    private static String[] detectFilesToExtract() {
+        String language = LocaleUtils.getLanguage(Locale.getDefault());
+        // Currenty (Oct 2016), this array can be as big as 4 entries, so using a capacity
+        // that allows a bit of growth, but is still in the right ballpark..
+        ArrayList<String> activeLocalePakFiles = new ArrayList<String>(6);
+        for (String pakFileName : BuildConfig.COMPRESSED_ASSETS) {
+            if (isPakFileForLanguage(pakFileName, language)
+                    || isPakFileForLanguage(pakFileName, FALLBACK_LOCALE)) {
+                activeLocalePakFiles.add(pakFileName);
+            }
+        }
+        return activeLocalePakFiles.toArray(new String[activeLocalePakFiles.size()]);
     }
 
     /**
@@ -329,6 +319,6 @@ public class ResourceExtractor {
      * Pak extraction not necessarily required by the embedder.
      */
     private static boolean shouldSkipPakExtraction() {
-        return sResourcesToExtract.length == 0;
+        return get().mAssetsToExtract.length == 0;
     }
 }

base/android/java/templates/BuildConfig.template

@@ -29,4 +29,19 @@ public class BuildConfig {
     public static final boolean DCHECK_IS_ON = false;
 #endif
 
+    // Sorted list of compressed assets contained in the apk (AssetManager.list() is slow).
+    public static final String[] COMPRESSED_ASSETS =
+#if defined(COMPRESSED_ASSETS_LIST)
+      COMPRESSED_ASSETS_LIST;
+#else
+      {};
+#endif
+
+    // Sorted list of uncompressed assets contained in the apk (AssetManager.list() is slow).
+    public static final String[] UNCOMPRESSED_ASSETS =
+#if defined(UNCOMPRESSED_ASSETS_LIST)
+      UNCOMPRESSED_ASSETS_LIST;
+#else
+      {};
+#endif
 }

blimp/client/app/android/java/src/org/chromium/blimp/BlimpApplication.java

@@ -10,7 +10,6 @@ import org.chromium.base.BaseChromiumApplication;
 import org.chromium.base.CommandLineInitUtil;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.PathUtils;
-import org.chromium.base.ResourceExtractor;
 
 /**
  * The {@link Application} for the Blimp client.
@@ -27,7 +26,6 @@ public class BlimpApplication extends BaseChromiumApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        ResourceExtractor.setResourcesToExtract(new ResourceExtractor.ResourceEntry[0]);
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);
         initCommandLine();
     }

blimp/client/app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java

@@ -6,7 +6,6 @@ package org.chromium.blimp;
 
 import android.os.Handler;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
@@ -81,7 +80,7 @@ public final class BlimpLibraryLoader {
         if (sLoadAttempted) return;
         sLoadAttempted = true;
 
-        ResourceExtractor extractor = ResourceExtractor.get(ContextUtils.getApplicationContext());
+        ResourceExtractor extractor = ResourceExtractor.get();
         extractor.startExtractingResources();
         LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
 

build/android/gyp/locale_pak_resources.py

-#!/usr/bin/env python
-#
-# Copyright 2015 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.
-"""Creates a resources.zip for locale .pak files.
-
-Places the locale.pak files into appropriate resource configs
-(e.g. en-GB.pak -> res/raw-en/en_gb.lpak). Also generates a locale_paks
-TypedArray so that resource files can be enumerated at runtime.
-"""
-
-import collections
-import optparse
-import os
-import sys
-import zipfile
-
-from util import build_utils
-
-
-# This should stay in sync with:
-# base/android/java/src/org/chromium/base/LocaleUtils.java
-_CHROME_TO_ANDROID_LOCALE_MAP = {
-    'he': 'iw',
-    'id': 'in',
-    'fil': 'tl',
-}
-
-
-def ToResourceFileName(name):
-  """Returns the resource-compatible file name for the given file."""
-  # Resources file names must consist of [a-z0-9_.].
-  # Changes extension to .lpak so that compression can be toggled separately for
-  # locale pak files vs other pak files.
-  return name.replace('-', '_').replace('.pak', '.lpak').lower()
-
-
-def CreateLocalePaksXml(names):
-  """Creates the contents for the locale-paks.xml files."""
-  VALUES_FILE_TEMPLATE = '''<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <array name="locale_paks">%s
-  </array>
-</resources>
-'''
-  VALUES_ITEM_TEMPLATE = '''
-    <item>@raw/%s</item>'''
-
-  res_names = (os.path.splitext(name)[0] for name in names)
-  items = ''.join((VALUES_ITEM_TEMPLATE % name for name in res_names))
-  return VALUES_FILE_TEMPLATE % items
-
-
-def ComputeMappings(sources):
-  """Computes the mappings of sources -> resources.
-
-  Returns a tuple of:
-    - mappings: List of (src, dest) paths
-    - lang_to_locale_map: Map of language -> list of resource names
-      e.g. "en" -> ["en_gb.lpak"]
-  """
-  lang_to_locale_map = collections.defaultdict(list)
-  mappings = []
-  for src_path in sources:
-    basename = os.path.basename(src_path)
-    name = os.path.splitext(basename)[0]
-    res_name = ToResourceFileName(basename)
-    if name == 'en-US':
-      dest_dir = 'raw'
-    else:
-      # Chrome's uses different region mapping logic from Android, so include
-      # all regions for each language.
-      android_locale = _CHROME_TO_ANDROID_LOCALE_MAP.get(name, name)
-      lang = android_locale[0:2]
-      dest_dir = 'raw-' + lang
-      lang_to_locale_map[lang].append(res_name)
-    mappings.append((src_path, os.path.join(dest_dir, res_name)))
-  return mappings, lang_to_locale_map
-
-
-def main():
-  parser = optparse.OptionParser()
-  build_utils.AddDepfileOption(parser)
-  parser.add_option('--locale-paks', help='List of files for res/raw-LOCALE')
-  parser.add_option('--resources-zip', help='Path to output resources.zip')
-  parser.add_option('--print-languages',
-      action='store_true',
-      help='Print out the list of languages that cover the given locale paks '
-           '(using Android\'s language codes)')
-
-  options, _ = parser.parse_args()
-  build_utils.CheckOptions(options, parser,
-                           required=['locale_paks'])
-
-  sources = build_utils.ParseGnList(options.locale_paks)
-
-  if options.depfile:
-    assert options.resources_zip
-    build_utils.WriteDepfile(options.depfile, options.resources_zip, sources)
-
-  mappings, lang_to_locale_map = ComputeMappings(sources)
-  if options.print_languages:
-    print '\n'.join(sorted(lang_to_locale_map))
-
-  if options.resources_zip:
-    with zipfile.ZipFile(options.resources_zip, 'w', zipfile.ZIP_STORED) as out:
-      for mapping in mappings:
-        out.write(mapping[0], mapping[1])
-
-      # Create TypedArray resources so ResourceExtractor can enumerate files.
-      def WriteValuesFile(lang, names):
-        dest_dir = 'values'
-        if lang:
-          dest_dir += '-' + lang
-        # Always extract en-US.lpak since it's the fallback.
-        xml = CreateLocalePaksXml(names + ['en_us.lpak'])
-        out.writestr(os.path.join(dest_dir, 'locale-paks.xml'), xml)
-
-      for lang, names in lang_to_locale_map.iteritems():
-        WriteValuesFile(lang, names)
-      WriteValuesFile(None, [])
-
-
-if __name__ == '__main__':
-  sys.exit(main())

build/android/gyp/write_build_config.py

@@ -209,12 +209,19 @@ def _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files):
   ret.reverse()
   return ret
 
+
 def _CreateJavaLibrariesList(library_paths):
-  """ Create a java literal array with the "base" library names:
+  """Returns a java literal array with the "base" library names:
   e.g. libfoo.so -> foo
   """
   return ('{%s}' % ','.join(['"%s"' % s[3:-3] for s in library_paths]))
 
+
+def _CreateJavaAssetList(assets):
+  """Returns a java literal array from a list of assets in the form src:dst."""
+  return '{%s}' % ','.join(sorted(['"%s"' % a.split(':')[1] for a in assets]))
+
+
 def main(argv):
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
@@ -233,8 +240,6 @@ def main(argv):
   parser.add_option('--package-name',
       help='Java package name for these resources.')
   parser.add_option('--android-manifest', help='Path to android manifest.')
-  parser.add_option('--is-locale-resource', action='store_true',
-                    help='Whether it is locale resource.')
   parser.add_option('--resource-dirs', action='append', default=[],
                     help='GYP-list of resource dirs')
 
@@ -290,8 +295,6 @@ def main(argv):
       help='GYP-list of proguard flag files to use in final apk.')
   parser.add_option('--proguard-info',
       help='Path to the proguard .info output for this apk.')
-  parser.add_option('--has-alternative-locale-resource', action='store_true',
-      help='Whether there is alternative-locale-resource in direct deps')
   parser.add_option('--fail',
       help='GYP-list of error message lines to fail with.')
 
@@ -339,21 +342,6 @@ def main(argv):
   deps = Deps(direct_deps_config_paths)
   all_inputs = deps.AllConfigPaths()
 
-  # Remove other locale resources if there is alternative_locale_resource in
-  # direct deps.
-  if options.has_alternative_locale_resource:
-    alternative = [r['path'] for r in deps.Direct('android_resources')
-                   if r.get('is_locale_resource')]
-    # We can only have one locale resources in direct deps.
-    if len(alternative) != 1:
-      raise Exception('The number of locale resource in direct deps is wrong %d'
-                       % len(alternative))
-    unwanted = [r['path'] for r in deps.All('android_resources')
-                if r.get('is_locale_resource') and r['path'] not in alternative]
-    for p in unwanted:
-      deps.RemoveNonDirectDep(p)
-
-
   direct_library_deps = deps.Direct('java_library')
   all_library_deps = deps.All('java_library')
 
@@ -485,8 +473,6 @@ def main(argv):
       deps_info['package_name'] = options.package_name
     if options.r_text:
       deps_info['r_text'] = options.r_text
-    if options.is_locale_resource:
-      deps_info['is_locale_resource'] = True
 
     deps_info['resources_dirs'] = []
     if options.resource_dirs:
@@ -658,6 +644,10 @@ def main(argv):
     }
     config['assets'], config['uncompressed_assets'] = (
         _MergeAssets(deps.All('android_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)
 

build/android/resource_sizes.py

@@ -184,12 +184,16 @@ def PrintApkAnalysis(apk_filename, chartjson=None):
   NO = lambda _: False
   FILE_GROUPS = (
       FileGroup('Native code', r'\.so$', lambda f: 'crazy' not in f),
-      FileGroup('Java code', r'\.dex$', YES),
-      FileGroup('Native resources (no l10n)', r'\.pak$', NO),
+      FileGroup('Java code', r'^classes.*\.dex$', YES),
+      FileGroup('Native resources (no l10n)',
+                r'^assets/.*(resources|percent)\.pak$', NO),
       # For locale paks, assume only english paks are extracted.
-      FileGroup('Native resources (l10n)', r'\.lpak$', lambda f: 'en_' in f),
-      FileGroup('ICU (i18n library) data', r'assets/icudtl\.dat$', NO),
-      FileGroup('V8 Snapshots', r'\.bin$', NO),
+      # Handles locale paks as bother resources or assets (.lpak or .pak).
+      FileGroup('Native resources (l10n)',
+                r'\.lpak$|^assets/.*(?!resources|percent)\.pak$',
+                lambda f: 'en_' in f or 'en-' in f),
+      FileGroup('ICU (i18n library) data', r'^assets/icudtl\.dat$', NO),
+      FileGroup('V8 Snapshots', r'^assets/.*\.bin$', NO),
       FileGroup('PNG drawables', r'\.png$', NO),
       FileGroup('Non-compiled Android resources', r'^res/', NO),
       FileGroup('Compiled Android resources', r'\.arsc$', NO),
@@ -221,13 +225,18 @@ def PrintApkAnalysis(apk_filename, chartjson=None):
   total_install_size = total_apk_size
 
   for group in FILE_GROUPS:
-    uncompressed_size = sum(member.file_size for member in found_files[group])
-    packed_size = sum(member.compress_size for member in found_files[group])
-    install_size = packed_size
-    install_bytes = sum(member.file_size for member in found_files[group]
-                        if group.extracted(member.filename))
-    install_size += install_bytes
-    total_install_size += install_bytes
+    uncompressed_size = 0
+    packed_size = 0
+    extracted_size = 0
+    for member in found_files[group]:
+      uncompressed_size += member.file_size
+      packed_size += member.compress_size
+      # Assume that if a file is not compressed, then it is not extracted.
+      is_compressed = member.compress_type != zipfile.ZIP_STORED
+      if is_compressed and group.extracted(member.filename):
+        extracted_size += member.file_size
+    install_size = packed_size + extracted_size
+    total_install_size += extracted_size
 
     ReportPerfResult(chartjson, apk_basename + '_Breakdown',
                      group.name + ' size', packed_size, 'bytes')

build/config/android/internal_rules.gni

@@ -275,13 +275,6 @@ template("write_build_config") {
           rebase_path(invoker.r_text, root_build_dir),
         ]
       }
-      if (defined(invoker.is_locale_resource) && invoker.is_locale_resource) {
-        args += [ "--is-locale-resource" ]
-      }
-      if (defined(invoker.has_alternative_locale_resource) &&
-          invoker.has_alternative_locale_resource) {
-        args += [ "--has-alternative-locale-resource" ]
-      }
     }
 
     if (is_android_resources && defined(invoker.resource_dirs)) {

build/config/android/rules.gni

@@ -607,69 +607,6 @@ if (enable_java_templates) {
     }
   }
 
-  # Creates a resources.zip with locale.pak files placed into appropriate
-  # resource configs (e.g. en-GB.pak -> res/raw-en/en_gb.pak). Also generates
-  # a locale_paks TypedArray so that resource files can be enumerated at runtime.
-  #
-  # If this target is included in the deps of an android resources/library/apk,
-  # the resources will be included with that target.
-  #
-  # Variables:
-  #   sources: List of .pak files. Names must be of the form "en.pak" or
-  #       "en-US.pak".
-  #   deps: (optional) List of dependencies that might be needed to generate
-  #       the .pak files.
-  #
-  # Example
-  #   locale_pak_resources("locale_paks") {
-  #     sources = [ "path/en-US.pak", "path/fr.pak", ... ]
-  #   }
-  template("locale_pak_resources") {
-    set_sources_assignment_filter([])
-    assert(defined(invoker.sources))
-
-    _base_path = "$target_gen_dir/$target_name"
-    _resources_zip = _base_path + ".resources.zip"
-    _build_config = _base_path + ".build_config"
-
-    write_build_config("${target_name}__build_config") {
-      build_config = _build_config
-      resources_zip = _resources_zip
-      type = "android_resources"
-      is_locale_resource = true
-    }
-
-    action("${target_name}__create_resources_zip") {
-      forward_variables_from(invoker,
-                             [
-                               "deps",
-                               "sources",
-                             ])
-      script = "//build/android/gyp/locale_pak_resources.py"
-      depfile = "$target_gen_dir/$target_name.d"
-
-      outputs = [
-        _resources_zip,
-      ]
-
-      _rebased_sources = rebase_path(sources, root_build_dir)
-      args = [
-        "--locale-paks=${_rebased_sources}",
-        "--resources-zip",
-        rebase_path(_resources_zip, root_build_dir),
-        "--depfile",
-        rebase_path(depfile, root_build_dir),
-      ]
-    }
-
-    group(target_name) {
-      public_deps = [
-        ":${target_name}__build_config",
-        ":${target_name}__create_resources_zip",
-      ]
-    }
-  }
-
   # Declare an Android resources target
   #
   # This creates a resources zip file that will be used when building an Android
@@ -1431,8 +1368,6 @@ if (enable_java_templates) {
   #   testonly: Marks this target as "test-only".
   #   write_asset_list: Adds an extra file to the assets, which contains a list of
   #     all other asset files.
-  #   alternative_locale_resource_dep: The locale resource target which overrides
-  #     any exsting locale resources in dep graph.
   #   requires_sdk_api_level_23: If defined and true, the apk is intended for
   #     installation only on Android M or later. In these releases the system
   #     linker does relocation unpacking, so we can enable it unconditionally.
@@ -1665,11 +1600,6 @@ if (enable_java_templates) {
         possible_config_deps = invoker.deps
       }
 
-      if (defined(invoker.alternative_locale_resource_dep)) {
-        possible_config_deps += [ invoker.alternative_locale_resource_dep ]
-        has_alternative_locale_resource = true
-      }
-
       # Added emma to the target's classpath via its .build_config.
       if (emma_coverage && !_emma_never_instrument) {
         possible_config_deps += [ "//third_party/android_tools:emma_device" ]
@@ -1720,9 +1650,6 @@ if (enable_java_templates) {
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
-      if (defined(invoker.alternative_locale_resource_dep)) {
-        deps += [ invoker.alternative_locale_resource_dep ]
-      }
     }
     _srcjar_deps += [ ":$process_resources_target" ]
 
@@ -1793,6 +1720,9 @@ if (enable_java_templates) {
         sources = [
           "//base/android/java/templates/BuildConfig.template",
         ]
+        deps = [
+          ":$build_config_target",
+        ]
 
         defines = []
         if (enable_multidex) {
@@ -1801,6 +1731,12 @@ if (enable_java_templates) {
         if (is_java_debug || dcheck_always_on) {
           defines += [ "_DCHECK_IS_ON" ]
         }
+        defines += [
+          "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" ]
     }

chrome/android/BUILD.gn

@@ -67,24 +67,12 @@ jinja_template("chrome_sync_shell_android_manifest") {
   ]
 }
 
-locale_pak_resources("chrome_locale_paks") {
-  sources = []
-  foreach(_locale, locales - android_chrome_omitted_locales) {
-    sources += [ "$root_out_dir/locales/$_locale.pak" ]
-  }
-
-  deps = [
-    "//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",
@@ -457,14 +445,6 @@ android_resources("chrome_public_apk_resources") {
   ]
 }
 
-# TODO(agrieve): Delete once downstream no longer references this target.
-java_group("chrome_public_apk_assets") {
-  deps = [
-    ":chrome_public_non_pak_assets",
-    ":chrome_public_pak_assets",
-  ]
-}
-
 java_group("chrome_public_non_pak_assets") {
   deps = [
     "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
@@ -481,6 +461,7 @@ android_assets("chrome_public_pak_assets") {
   disable_compression = true
 
   deps = [
+    ":chrome_public_locale_pak_assets",
     "//chrome:packed_resources",
     "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
     "//third_party/icu:icu_assets",
@@ -488,6 +469,19 @@ android_assets("chrome_public_pak_assets") {
   ]
 }
 
+# This target is separate from chrome_public_pak_assets because it does not
+# disable compression.
+android_assets("chrome_public_locale_pak_assets") {
+  sources = []
+  foreach(_locale, locales - android_chrome_omitted_locales) {
+    sources += [ "$root_out_dir/locales/$_locale.pak" ]
+  }
+
+  deps = [
+    "//chrome:packed_resources",
+  ]
+}
+
 jinja_template_resources("chrome_public_apk_template_resources") {
   resources = [
     "java/res_template/xml/chromebackupscheme.xml",
@@ -564,11 +558,15 @@ if (current_toolchain == default_toolchain) {
     }
   }
 
-  locale_pak_resources("monochrome_locale_paks") {
-    sources = []
+  android_assets("monochrome_pak_assets") {
+    sources = [
+      "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
+      "$target_gen_dir/monochrome_paks/resources.pak",
+    ]
     foreach(_locale, locales) {
       sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ]
     }
+    disable_compression = true
 
     deps = [
       ":monochrome_paks",
@@ -576,17 +574,6 @@ if (current_toolchain == default_toolchain) {
   }
 }  # current_toolchain == host_toolchain
 
-android_assets("monochrome_pak_assets") {
-  sources = [
-    "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
-    "$target_gen_dir/monochrome_paks/resources.pak",
-  ]
-  deps = [
-    ":monochrome_paks",
-  ]
-  disable_compression = true
-}
-
 #
 # Only 32-bit //chrome/android/monochrome is needed, beside
 # being built with 32-bit default toolchain, it is also built
@@ -642,11 +629,11 @@ template("chrome_public_apk_tmpl_shared") {
     forward_variables_from(invoker, "*")
 
     native_lib_version_rule = "//build/util:chrome_version_json"
-
     deps += [
       ":chrome_java",
-      ":chrome_public_apk_assets",
       ":chrome_public_apk_resources",
+      ":chrome_public_non_pak_assets",
+      ":chrome_public_pak_assets",
       "//base:base_java",
     ]
   }

chrome/android/chrome_public_apk_tmpl.gni

@@ -92,8 +92,6 @@ template("monochrome_public_apk_tmpl") {
           [ "//chrome/android:monochrome_secondary_abi_lib" ]
     }
 
-    alternative_locale_resource_dep = "//chrome/android:monochrome_locale_paks"
-
     alternative_android_sdk_jar = webview_framework_jar
     app_as_shared_lib = true
     use_chromium_linker = false

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

@@ -17,13 +17,11 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CommandLineInitUtil;
 import org.chromium.base.ContextUtils;
-import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.ProcessInitException;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.banners.AppDetailsDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.datausage.ExternalDataUseObserver;
@@ -69,7 +67,6 @@ import org.chromium.content.browser.ChildProcessCreationParams;
 import org.chromium.policy.AppRestrictionsProvider;
 import org.chromium.policy.CombinedPolicyProvider;
 import org.chromium.printing.PrintingController;
-import org.chromium.ui.base.ResourceBundle;
 
 /**
  * Basic application functionality that should be shared among all browser applications that use
@@ -158,14 +155,6 @@ public class ChromeApplication extends ContentApplication {
                 SavePasswordsPreferences.class.getName());
     }
 
-    @Override
-    protected void initializeLibraryDependencies() {
-        // The ResourceExtractor is only needed by the browser process, but this will have no
-        // impact on the renderer process construction.
-        ResourceBundle.initializeLocalePaks(this, R.array.locale_paks);
-        ResourceExtractor.setResourcesToExtract(ResourceBundle.getActiveLocaleResources());
-    }
-
     @Override
     public void initCommandLine() {
         CommandLineInitUtil.initCommandLine(this, COMMAND_LINE_FILE);

chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

@@ -208,7 +208,7 @@ public class ChromeBrowserInitializer {
         // Check to see if we need to extract any new resources from the APK. This could
         // be on first run when we need to extract all the .pak files we need, or after
         // the user has switched locale, in which case we want new locale resources.
-        ResourceExtractor.get(mApplication).startExtractingResources();
+        ResourceExtractor.get().startExtractingResources();
 
         mPostInflationStartupComplete = true;
     }

content/public/android/java/src/org/chromium/content/app/ContentApplication.java

@@ -56,17 +56,9 @@ public abstract class ContentApplication extends BaseChromiumApplication {
             }
         });
 
-        initializeLibraryDependencies();
         mLibraryDependenciesInitialized = true;
     }
 
-    /**
-     * Initialize all the dependencies that need to be setup before library loading can be
-     * kicked off.
-     */
-    protected void initializeLibraryDependencies() {
-    }
-
     /**
      * @return Whether the library dependencies have been initialized and it is safe to issue
      *         requests to load the native library.

content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

@@ -290,7 +290,7 @@ public class BrowserStartupController {
         // Normally Main.java will have kicked this off asynchronously for Chrome. But other
         // ContentView apps like tests also need them so we make sure we've extracted resources
         // here. We can still make it a little async (wait until the library is loaded).
-        ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext);
+        ResourceExtractor resourceExtractor = ResourceExtractor.get();
         resourceExtractor.startExtractingResources();
 
         // This strictmode exception is to cover the case where the browser process is being started
@@ -336,7 +336,7 @@ public class BrowserStartupController {
      * Initialization needed for tests. Mainly used by content browsertests.
      */
     public void initChromiumBrowserProcessForTests() {
-        ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext);
+        ResourceExtractor resourceExtractor = ResourceExtractor.get();
         resourceExtractor.startExtractingResources();
         resourceExtractor.waitForCompletion();
         nativeSetCommandLineFlags(false, null);

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java

@@ -27,10 +27,6 @@ public class ContentShellApplication extends ContentApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-    }
-
-    @Override
-    protected void initializeLibraryDependencies() {
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);
     }
 

ui/android/java/src/org/chromium/ui/base/ResourceBundle.java

@@ -4,18 +4,12 @@
 
 package org.chromium.ui.base;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-
-import org.chromium.base.ResourceExtractor;
-import org.chromium.base.ThreadUtils;
+import org.chromium.base.BuildConfig;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.SuppressFBWarnings;
 
 import java.io.File;
-import java.util.Locale;
+import java.util.Arrays;
 
 /**
  * This class provides the resource bundle related methods for the native
@@ -23,67 +17,13 @@ import java.util.Locale;
  */
 @JNINamespace("ui")
 public class ResourceBundle {
-    private static ResourceExtractor.ResourceEntry[] sActiveLocaleResources;
-
-    /**
-     * Applies the reverse mapping done by locale_pak_resources.py.
-     */
-    private static String toChromeLocaleName(String srcFileName) {
-        srcFileName = srcFileName.replace(".lpak", ".pak");
-        String[] parts = srcFileName.split("_");
-        if (parts.length > 1) {
-            int dotIdx = parts[1].indexOf('.');
-            return parts[0] + "-" + parts[1].substring(0, dotIdx).toUpperCase(Locale.ENGLISH)
-                    + parts[1].substring(dotIdx);
-        }
-        return srcFileName;
-    }
-
-    /**
-     * Initializes the list of locale packs for the active locale that are
-     * present within the apk.
-     *
-     * @param context Any context
-     * @param localePaksResId Resource ID locale_paks (generated by
-     *            locale_pak_resources.py)
-     */
-    @SuppressFBWarnings("LI_LAZY_INIT_UPDATE_STATIC")  // Not thread-safe.
-    public static void initializeLocalePaks(Context context, int localePaksResId) {
-        ThreadUtils.assertOnUiThread();
-        assert sActiveLocaleResources == null;
-        Resources resources = context.getResources();
-        TypedArray resIds = resources.obtainTypedArray(localePaksResId);
-        try {
-            int len = resIds.length();
-            sActiveLocaleResources = new ResourceExtractor.ResourceEntry[len];
-            for (int i = 0; i < len; ++i) {
-                int resId = resIds.getResourceId(i, 0);
-                String resPath = resources.getString(resId);
-                String srcBaseName = new File(resPath).getName();
-                String dstBaseName = toChromeLocaleName(srcBaseName);
-                sActiveLocaleResources[i] = new ResourceExtractor.ResourceEntry(resId, resPath,
-                        dstBaseName);
-            }
-        } finally {
-            resIds.recycle();
-        }
-    }
-
-    @SuppressFBWarnings("MS_EXPOSE_REP")  // Don't modify the array.
-    public static ResourceExtractor.ResourceEntry[] getActiveLocaleResources() {
-        return sActiveLocaleResources;
-    }
+    private static final String ASSET_DIR = "assets";
 
     @CalledByNative
     private static String getLocalePakResourcePath(String locale) {
-        if (sActiveLocaleResources == null) {
-            return null;
-        }
         String fileName = locale + ".pak";
-        for (ResourceExtractor.ResourceEntry entry : sActiveLocaleResources) {
-            if (fileName.equals(entry.extractedFileName)) {
-                return entry.pathWithinApk;
-            }
+        if (Arrays.binarySearch(BuildConfig.UNCOMPRESSED_ASSETS, fileName) >= 0) {
+            return new File(ASSET_DIR, fileName).toString();
         }
         return null;
     }