Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / shell / android / shell_apk / src / org / chromium / content_shell_apk / ContentShellApplication.java

diff --git a/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java b/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
index 43ded48..a1c74c7 100644 (file)
--- a/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
+++ b/src/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
@@ -5,16 +5,25 @@
 package org.chromium.content_shell_apk;
 
 import org.chromium.base.PathUtils;
+import org.chromium.base.ResourceExtractor;
+
 import org.chromium.content.app.ContentApplication;
-import org.chromium.content.browser.ResourceExtractor;
 
 /**
  * Entry point for the content shell application.  Handles initialization of information that needs
  * to be shared across the main activity and the child services created.
  */
 public class ContentShellApplication extends ContentApplication {
-
-    private static final String[] MANDATORY_PAK_FILES = new String[] {"content_shell.pak"};
+    /**
+     * icudtl.dat provides ICU (i18n library) with all the data for its
+     * operation. We use to link it statically to our binary, but not any more
+     * so that we have to install it along with other mandatory pak files.
+     * See src/third_party/icu/README.chromium.
+     */
+    private static final String[] MANDATORY_PAK_FILES = new String[] {
+        "content_shell.pak",
+        "icudtl.dat"
+    };
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";
 
     @Override