diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-10-05 13:14:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-05 20:15:50 +0000 |
| commit | 46db4962dfb808c537f3a3d28e6e241e3c41692a (patch) | |
| tree | 0483c724dc189580d74d9a61deb87350918168ee /android_webview/android_webview.gyp | |
| parent | a4dae22c31f10bf046c2625a39714fd0f58089c0 (diff) | |
| download | chromium_src-46db4962dfb808c537f3a3d28e6e241e3c41692a.zip chromium_src-46db4962dfb808c537f3a3d28e6e241e3c41692a.tar.gz chromium_src-46db4962dfb808c537f3a3d28e6e241e3c41692a.tar.bz2 | |
Split locale paks into 2 list.
In order to merge the chrome and webview resources
- Split locale paks into 2 list, one is the commnon locale with chrome,
another is webview individual.
- Also move the definition of webviewchromium.pak path to gypi.
So rename system_webview_locales_paks.gypi to system_webview_paks.gypi.
BUG=514883
Review URL: https://codereview.chromium.org/1381323002
Cr-Commit-Position: refs/heads/master@{#352401}
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index aceabd9..4cdb980 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -47,7 +47,7 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(grit_out_dir)/aw_resources.pak', ], - 'pak_output': '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak', + 'pak_output': '<(webview_chromium_pak_path)', }, 'includes': [ '../build/repack_action.gypi' ], }, @@ -114,10 +114,12 @@ 'target_name': 'android_webview_locale_paks', 'type': 'none', 'variables': { - 'locale_pak_files': [ '<@(webview_locales_input_paks)' ], + 'locale_pak_files': [ + '<@(webview_locales_input_common_paks)', + '<@(webview_locales_input_individual_paks)', + ], }, 'includes': [ - 'apk/system_webview_locales_paks.gypi', '../build/android/locale_pak_resources.gypi', ], }, @@ -428,5 +430,6 @@ ], 'includes': [ 'android_webview_tests.gypi', + 'apk/system_webview_paks.gypi', ], } |