Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3181)

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

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestApplication.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
index 43ded486615d63a25794450936ca5fc8310c0bf0..b068ea0cfcc032b95f68803f66080def0df8d1f4 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
@@ -13,8 +13,16 @@ import org.chromium.content.browser.ResourceExtractor;
* 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
« no previous file with comments | « content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestApplication.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698