diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 22:08:57 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 22:08:57 +0000 |
| commit | b4934e5d7a15192bff9993395983a7930942b93e (patch) | |
| tree | a3b99a3e4816fb88cf870d897bdade2ba0a4eb1f /android_webview/android_webview_tests.gypi | |
| parent | a4b0f408ac92589d244e6d0ca05309865c5ec5aa (diff) | |
| download | chromium_src-b4934e5d7a15192bff9993395983a7930942b93e.zip chromium_src-b4934e5d7a15192bff9993395983a7930942b93e.tar.gz chromium_src-b4934e5d7a15192bff9993395983a7930942b93e.tar.bz2 | |
Enable icu_use_data_file_flag on Android
0. Roll icu to r249466 to copy Android-specific icudtl.dat
1. Turn it in build/common.gypi by default except for android webview build. Move it inside L2 var dict and pull it up to the top level var dict to make 'Google Chrome' build on Android happy.
2. Add an entry for icudtl.dat to chrome/chrome_android_paks.gypi so that
it's copied to assets directory for Chrome and related targets.
3. Extract icudtl.dat from the asset and copy to DIR_ANDROID_APP_DATA and make it world-readable so that child processes (sandboxed with uid) can read it.
4. Add icudtl.dat to MANDATORY_PAKS list in various Android build targets
Google Chrome has #4 but in a separate CL ( https://chrome-internal-review.googlesource.com/#/c/155554/ ). That CL will land before this CL.
TBR=avi@chromium.org
BUG=72633
TEST=base_unittests:*Convers*, net_unittests:*IDN*, browser tests on all platforms.
Review URL: https://codereview.chromium.org/156333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/android_webview_tests.gypi')
| -rw-r--r-- | android_webview/android_webview_tests.gypi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi index 5ad85fe..9eadf38 100644 --- a/android_webview/android_webview_tests.gypi +++ b/android_webview/android_webview_tests.gypi @@ -22,6 +22,13 @@ '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png', '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html', ], + 'conditions': [ + ['icu_use_data_file_flag==1', { + 'additional_input_paths': [ + '<(PRODUCT_DIR)/icudtl.dat', + ], + }], + ], }, 'copies': [ { @@ -31,6 +38,13 @@ '<(java_in_dir)/assets/asset_icon.png', '<(java_in_dir)/assets/full_screen_video_test.html', ], + 'conditions': [ + ['icu_use_data_file_flag==1', { + 'files': [ + '<(PRODUCT_DIR)/icudtl.dat', + ], + }], + ], }, ], 'includes': [ '../build/java_apk.gypi' ], |