commit 77b7b35987d9420138ebc3fcb7d24d786bf5549c
author David 'Digit' Turner <digit@google.com> Fri Nov 09 16:32:23 2018
committer Commit Bot <commit-bot@chromium.org> Fri Nov 09 16:32:23 2018
tree 64924e21af3a40c05fd707b97802f0095e38a3ff
parent d7bfd5bb2031d217d0e0f87240b4ce16705abb3d

Android: Fix resource extraction from splits for Hebrew and others.

This CL fixes a bug in the logic used to locate locale .pak files
inside bundle splits. The reason for the bug is that bundletool
wants to use deprecated language names (i.e. 'iw' instead of 'he')
to store asset files.

As an example, for Hebrew, Chrome was looking at:

  assets/locales#lang_he/he.pak

While the file was really stored under:

  assets/locales#lang_iw/he.pak

The CL fixes the issue for Hebrew, Yiddish and Indonesian and
Filipino.

BUG=902915
R=benmason@chromium.org, tiborg@chromium.org, yfriedman@chromium.org, twellington@chromium.org

Change-Id: I420158c30ba33c6203495af9453877722271e104
Reviewed-on: https://chromium-review.googlesource.com/c/1327203
Commit-Queue: David Turner <digit@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606866}

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

diff --git a/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
index d913975..54215e2c 100644
--- a/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
+++ b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
@@ -112,6 +112,33 @@
     }
 
     /**
+     * Return the asset split language associated with a given Chromium language.
+     *
+     * This matches the directory used to store language-based assets in bundle APK splits.
+     * E.g. for Hebrew, known as 'he' by Chromium, this method should return 'iw' because
+     * the .pak file will be stored as /assets/locales#lang_iw/he.pak within the split.
+     *
+     * @param language Chromium specific language name.
+     * @return Matching Android specific language name.
+     */
+    public static String getSplitLanguageForAndroid(String language) {
+        // IMPORTANT: Keep in sync with the mapping found in:
+        // build/android/gyp/util/resource_utils.py
+        switch (language) {
+            case "he":
+                return "iw"; // Hebrew
+            case "yi":
+                return "ji"; // Yiddish
+            case "id":
+                return "in"; // Indonesian
+            case "fil":
+                return "tl"; // Filipino
+            default:
+                return language;
+        }
+    }
+
+    /**
      * Return one default locale-specific PAK file name associated with a given language.
      *
      * @param language Language name (e.g. "en").

ui/android/java/src/org/chromium/ui/resources/ResourceExtractor.java

diff --git a/ui/android/java/src/org/chromium/ui/resources/ResourceExtractor.java b/ui/android/java/src/org/chromium/ui/resources/ResourceExtractor.java
index 244e64a..5af31fc6 100644
--- a/ui/android/java/src/org/chromium/ui/resources/ResourceExtractor.java
+++ b/ui/android/java/src/org/chromium/ui/resources/ResourceExtractor.java
@@ -180,7 +180,8 @@
         //
         AssetManager assetManager = ContextUtils.getApplicationAssets();
         String localesSrcDir;
-        String langSpecificPath = COMPRESSED_LOCALES_DIR + "#lang_" + uiLanguage;
+        String androidSplitLanguage = LocalizationUtils.getSplitLanguageForAndroid(uiLanguage);
+        String langSpecificPath = COMPRESSED_LOCALES_DIR + "#lang_" + androidSplitLanguage;
         String defaultLocalePakName =
                 LocalizationUtils.getDefaultCompressedPakLocaleForLanguage(uiLanguage) + ".pak";
 

ui/android/junit/src/org/chromium/ui/base/LocalizationUtilsTest.java

diff --git a/ui/android/junit/src/org/chromium/ui/base/LocalizationUtilsTest.java b/ui/android/junit/src/org/chromium/ui/base/LocalizationUtilsTest.java
index 3cf5ab6..d061381 100644
--- a/ui/android/junit/src/org/chromium/ui/base/LocalizationUtilsTest.java
+++ b/ui/android/junit/src/org/chromium/ui/base/LocalizationUtilsTest.java
@@ -34,6 +34,17 @@
 
     @Test
     @SmallTest
+    public void testGetSplitLanguageForAndroid() {
+        assertEquals("en", LocalizationUtils.getSplitLanguageForAndroid("en"));
+        assertEquals("es", LocalizationUtils.getSplitLanguageForAndroid("es"));
+        assertEquals("fr", LocalizationUtils.getSplitLanguageForAndroid("fr"));
+        assertEquals("iw", LocalizationUtils.getSplitLanguageForAndroid("he"));
+        assertEquals("ji", LocalizationUtils.getSplitLanguageForAndroid("yi"));
+        assertEquals("tl", LocalizationUtils.getSplitLanguageForAndroid("fil"));
+    }
+
+    @Test
+    @SmallTest
     public void testChromiumLocaleMatchesLanguage() {
         assertTrue(LocalizationUtils.chromiumLocaleMatchesLanguage("en-US", "en"));
         assertTrue(LocalizationUtils.chromiumLocaleMatchesLanguage("en-GB", "en"));