diff options
| author | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 18:11:33 +0000 |
|---|---|---|
| committer | primiano@chromium.org <primiano@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-29 18:11:33 +0000 |
| commit | dd1c2a75d2dacd95526ec21ab765098fd931def8 (patch) | |
| tree | 0ac7959e93bb4e1e299df3f43b24a832c3f3c8c7 /android_webview/android_webview.gyp | |
| parent | ee9eef6a6f5656da2305fc103282ae613ac8e309 (diff) | |
| download | chromium_src-dd1c2a75d2dacd95526ec21ab765098fd931def8.zip chromium_src-dd1c2a75d2dacd95526ec21ab765098fd931def8.tar.gz chromium_src-dd1c2a75d2dacd95526ec21ab765098fd931def8.tar.bz2 | |
[android_webview] Do not extract webviewchromium.pak
- Change the android_webview_apk gyp files to include the en-US.pak
file in the apk, which was erroneously missing.
- Add the do_not_compress gyp plumbing to store and zipalign paks in
the apk (only for the android_webview_apk target).
- Stop decompressing pak files in the android webview shell apk.
- Change aw_browser_main_parts.cc to take advantage of the new AwAssets
and DataPack/ResourceBundle *FromRegion methods (mmap from the apk).
- Add temporary workaround which loads always the en-US.pak locale, in
lack of a proper refactoring of i10n_utils and ResourceBundle.
BUG=394502
Review URL: https://codereview.chromium.org/402603006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286258 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index f07f38a..cf93d1c 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -83,6 +83,14 @@ 'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak', }, 'includes': [ '../build/repack_action.gypi' ], + }, + { + 'action_name': 'add_en_US_pak_locale', + 'variables': { + 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak'], + 'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/en-US.pak', + }, + 'includes': [ '../build/repack_action.gypi' ], } ], }, |