commit 26fd1fad3b61ebf5ca47fa3c53c0da52767c8447
author Andrew Grieve <agrieve@chromium.org> Sat Nov 04 00:29:12 2017 +0900
committer Qijiang Fan <fqj@google.com> Fri Jun 05 07:40:12 2020 +0900
tree f127dfedab4f0197febb89af76dc7d8beff3d406
parent ca72b4365c506879a672e979c5fbe08b35c9474a

Android: Fix Filipino locale showing as en-US

The pak was broken due to assuming all locales are 2 characters.
The arsc was broken due to a typo in package_resources.py

Bug: 780331
Change-Id: Ic208e5faa251e07f32288b723f9c7b9307ec76a1
Reviewed-on: https://chromium-review.googlesource.com/751284
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513788}

CrOS-Libchrome-Original-Commit: 51af90bc8f9ed49daa83872bb04a74cc89c8b842

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

diff --git a/base/android/java/src/org/chromium/base/ResourceExtractor.java b/base/android/java/src/org/chromium/base/ResourceExtractor.java
index d4389c9..5949d96 100644
--- a/base/android/java/src/org/chromium/base/ResourceExtractor.java
+++ b/base/android/java/src/org/chromium/base/ResourceExtractor.java
@@ -152,6 +152,8 @@
             assert Arrays.asList(BuildConfig.COMPRESSED_LOCALES).contains(FALLBACK_LOCALE);
             activeLocalePakFiles.add(FALLBACK_LOCALE + ".pak");
         }
+        Log.i(TAG, "Android Locale: %s requires .pak files: %s", defaultLocale,
+                activeLocalePakFiles);
         return activeLocalePakFiles.toArray(new String[activeLocalePakFiles.size()]);
     }