| Index: ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| diff --git a/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java b/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| index c1965b4b77c707e4b45b922e4827567b404f5a9a..bc82307fcebac87f799629f8850526b231069f04 100644
|
| --- a/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| +++ b/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| @@ -8,6 +8,7 @@
|
| import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.base.annotations.JNINamespace;
|
|
|
| +import java.io.File;
|
| import java.util.Arrays;
|
|
|
| /**
|
| @@ -16,10 +17,13 @@
|
| */
|
| @JNINamespace("ui")
|
| public class ResourceBundle {
|
| + private static final String ASSET_DIR = "assets";
|
| +
|
| @CalledByNative
|
| private static String getLocalePakResourcePath(String locale) {
|
| - if (Arrays.binarySearch(BuildConfig.UNCOMPRESSED_LOCALES, locale) >= 0) {
|
| - return "assets/" + locale + ".pak";
|
| + String fileName = locale + ".pak";
|
| + if (Arrays.binarySearch(BuildConfig.UNCOMPRESSED_ASSETS, fileName) >= 0) {
|
| + return new File(ASSET_DIR, fileName).toString();
|
| }
|
| return null;
|
| }
|
|
|