| Index: build/android/finalize_splits_action.gypi
|
| diff --git a/build/android/finalize_splits_action.gypi b/build/android/finalize_splits_action.gypi
|
| index 4472d5a8a968b80f2c0f0f30391ce199144518e9..566cd5033d9872da5cd3e297fc4161e5e92feb0e 100644
|
| --- a/build/android/finalize_splits_action.gypi
|
| +++ b/build/android/finalize_splits_action.gypi
|
| @@ -18,7 +18,7 @@
|
| 'keystore_password%': 'chromium',
|
| 'zipalign_path%': '<(android_sdk_tools)/zipalign',
|
| 'density_splits%': 0,
|
| - 'language_splits%': 0,
|
| + 'language_splits%': [],
|
| 'resource_packaged_apk_name': '<(apk_name)-resources.ap_',
|
| 'resource_packaged_apk_path': '<(intermediate_dir)/<(resource_packaged_apk_name)',
|
| 'base_output_path': '<(PRODUCT_DIR)/apks/<(apk_name)',
|
| @@ -42,11 +42,11 @@
|
| ['density_splits == 1', {
|
| 'message': 'Signing/aligning <(_target_name) density splits',
|
| 'inputs': [
|
| - '<(resource_packaged_apk_path)-hdpi',
|
| - '<(resource_packaged_apk_path)-xhdpi',
|
| - '<(resource_packaged_apk_path)-xxhdpi',
|
| - '<(resource_packaged_apk_path)-xxxhdpi',
|
| - '<(resource_packaged_apk_path)-tvdpi',
|
| + '<(resource_packaged_apk_path)_hdpi',
|
| + '<(resource_packaged_apk_path)_xhdpi',
|
| + '<(resource_packaged_apk_path)_xxhdpi',
|
| + '<(resource_packaged_apk_path)_xxxhdpi',
|
| + '<(resource_packaged_apk_path)_tvdpi',
|
| ],
|
| 'outputs': [
|
| '<(base_output_path)-density-hdpi.apk',
|
| @@ -59,12 +59,16 @@
|
| '--densities=hdpi,xhdpi,xxhdpi,xxxhdpi,tvdpi',
|
| ],
|
| }],
|
| - # TODO(agrieve): Implement language splits
|
| - ['language_splits == 1', {
|
| + ['language_splits != 1', {
|
| 'message': 'Signing/aligning <(_target_name) language splits',
|
| 'inputs': [
|
| + "<!@(python <(DEPTH)/build/apply_locales.py '<(resource_packaged_apk_path)_ZZLOCALE' <(language_splits))",
|
| ],
|
| 'outputs': [
|
| + "<!@(python <(DEPTH)/build/apply_locales.py '<(base_output_path)-lang-ZZLOCALE.apk' <(language_splits))",
|
| + ],
|
| + 'action': [
|
| + '--languages=<(language_splits)',
|
| ],
|
| }],
|
| ],
|
|
|