sync locales pak files

mogoweb · Nov 1, 2015 · 651a0a8 · 651a0a8
1 parent 42ad7ac
commit 651a0a8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/app/src/main/java/org/chromium/chrome/browser/ChromeApplication.java b/app/src/main/java/org/chromium/chrome/browser/ChromeApplication.java
@@ -431,8 +431,7 @@ protected void showSingleOriginSettings(String url) {
     protected void initializeLibraryDependencies() {
         // The ResourceExtractor is only needed by the browser process, but this will have no
         // impact on the renderer process construction.
-        // TODO:(alex)
-//        ResourceBundle.initializeLocalePaks(this, R.array.locale_paks);
+        ResourceBundle.initializeLocalePaks(this, R.array.locale_paks);
         if (!BuildInfo.hasLanguageApkSplits(this)) {
             ResourceExtractor.setResourcesToExtract(ResourceBundle.getActiveLocaleResources());
         }

diff --git a/app/src/main/res/assets/locales/en-US.pak b/app/src/main/res/assets/locales/en-US.pak
diff --git a/app/src/main/res/assets/locales/zh-CN.pak b/app/src/main/res/assets/locales/zh-CN.pak
diff --git a/libraries/chrome_res/src/main/res/values/locales.xml b/libraries/chrome_res/src/main/res/values/locales.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="locales_en_us">locales/en-US.pak</string>
+    <string name="locales_zh_cn">locales/zh-CN.pak</string>
+
+    <!-- for locales pak  -->
+    <array name="locale_paks">
+        <item>@string/locales_en_us</item>
+        <item>@string/locales_zh_cn</item>
+    </array>
+</resources>
diff --git a/script/sync_chromium.py b/script/sync_chromium.py
@@ -125,8 +125,15 @@ def sync_manifest_files(options):
     policy_gen_dir = os.path.join(options.chromium_root, "out", options.buildtype,
                                   "gen", "policy")
     args = {'only': ['\S+\\.xml']}
+    # TODO(alex)
     # sync(policy_gen_dir, xml_dir, "sync", **args)
 
+def sync_data_files(options):
+    locales_dir = os.path.join(constants.DIR_APP_ROOT, "src", "main", "res", "assets", "locales")
+    pak_gen_dir = os.path.join(options.chromium_root, "out", options.buildtype, "locales")
+    args = {'only': ['en-US.pak', 'zh-CN.pak']}
+    sync(pak_gen_dir, locales_dir, "sync", **args)
+
 def main(argv):
     parser = optparse.OptionParser(usage='Usage: %prog [options]', description=__doc__)
     parser.add_option('--chromium_root',
@@ -149,6 +156,7 @@ def main(argv):
     sync_datausagechart_res_files(options)
     sync_androidmedia_res_files(options)
     sync_manifest_files(options)
+    sync_data_files(options)
 
 if __name__ == '__main__':
     main(sys.argv)