| Index: android_webview/apk/system_webview_apk_common.gypi
|
| diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi
|
| index dae95acb1549adf5184830d303fd6f277f2d44a5..bec728ff7d705265946e037cc7968d9a131914ad 100644
|
| --- a/android_webview/apk/system_webview_apk_common.gypi
|
| +++ b/android_webview/apk/system_webview_apk_common.gypi
|
| @@ -21,10 +21,12 @@
|
| # TODO: crbug.com/442348 Update proguard.flags and re-enable.
|
| 'proguard_enabled': 'false',
|
| 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'],
|
| + 'android_locales_input_paks_folder': '<(PRODUCT_DIR)/android_webview_assets/',
|
| + 'android_locales_output_paks_folder': '<(asset_location)',
|
| # TODO: crbug.com/405035 Find a better solution for WebView .pak files.
|
| 'additional_input_paths': [
|
| + '<@(android_locales_output_paks)',
|
| '<(asset_location)/webviewchromium.pak',
|
| - '<(asset_location)/en-US.pak',
|
| '<(asset_location)/webview_licenses.notice',
|
| ],
|
| 'conditions': [
|
| @@ -45,8 +47,8 @@
|
| {
|
| 'destination': '<(asset_location)',
|
| 'files': [
|
| + '<@(android_locales_input_paks)',
|
| '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
|
| - '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
|
| ],
|
| 'conditions': [
|
| ['icu_use_data_file_flag==1', {
|
| @@ -83,5 +85,8 @@
|
| 'message': 'Generating WebView license notice',
|
| },
|
| ],
|
| - 'includes': [ '../../build/java_apk.gypi' ],
|
| + 'includes': [
|
| + '../../build/java_apk.gypi',
|
| + '../../content/android_locales_paks.gypi',
|
| + ],
|
| }
|
|
|