diff options
| author | agrieve <agrieve@chromium.org> | 2015-05-22 14:32:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-22 21:32:41 +0000 |
| commit | ac94e41f40bfc5252dc23dd72549d985ca221168 (patch) | |
| tree | 534d46c9b2f6558e0cd85e749dcc25bc752beaaf /build/java_apk.gypi | |
| parent | e62fd3d1df77c792693f065c99bc2fb67a42e7bd (diff) | |
| download | chromium_src-ac94e41f40bfc5252dc23dd72549d985ca221168.zip chromium_src-ac94e41f40bfc5252dc23dd72549d985ca221168.tar.gz chromium_src-ac94e41f40bfc5252dc23dd72549d985ca221168.tar.bz2 | |
Add create_density_splits option to java_apk.gypi / android_apk (gn)
BUG=488324
Review URL: https://codereview.chromium.org/1133603004
Cr-Commit-Position: refs/heads/master@{#331177}
Diffstat (limited to 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 7ef4296..951d36b 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -31,6 +31,8 @@ # additional_bundled_libs - Additional libraries what will be stripped and # bundled in the apk. # asset_location - The directory where assets are located. +# create_density_splits - Whether to create density-based apk splits. Splits +# are supported only for minSdkVersion >= 21. # generated_src_dirs - Same as additional_src_dirs except used for .java files # that are generated at build time. This should be set automatically by a # target's dependencies. The .java files in these directories are not @@ -67,6 +69,7 @@ 'tested_apk_obfuscated_jar_path%': '/', 'tested_apk_dex_path%': '/', 'additional_input_paths': [], + 'create_density_splits%': 0, 'input_jars_paths': [], 'library_dexed_jars_paths': [], 'additional_src_dirs': [], @@ -132,6 +135,7 @@ 'resource_zip_path': '<(intermediate_dir)/<(_target_name).resources.zip', 'shared_resources%': 0, 'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk', + 'final_apk_path_no_extension%': '<(PRODUCT_DIR)/apks/<(apk_name)', 'final_abi_split_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name)-abi-<(android_app_abi).apk', 'incomplete_apk_path': '<(intermediate_dir)/<(apk_name)-incomplete.apk', 'apk_install_record': '<(intermediate_dir)/apk_install.record.stamp', @@ -576,6 +580,7 @@ 'apk_name': '<(main_apk_name)-abi-<(android_app_abi)', 'asset_location': '', 'android_manifest_path': '<(split_android_manifest_path)', + 'create_density_splits': 0, }, 'includes': [ 'android/package_resources_action.gypi' ], }, @@ -651,11 +656,36 @@ 'action': [ '--apk-path=<(incomplete_apk_path)', ], - }] + }], + ['create_density_splits == 1', { + 'inputs': [ + '<(final_apk_path_no_extension)-density-hdpi.apk', + '<(final_apk_path_no_extension)-density-xhdpi.apk', + '<(final_apk_path_no_extension)-density-xxhdpi.apk', + '<(final_apk_path_no_extension)-density-tvdpi.apk', + ], + 'action': [ + '--split-apk-path=<(final_apk_path_no_extension)-density-hdpi.apk', + '--split-apk-path=<(final_apk_path_no_extension)-density-xhdpi.apk', + '--split-apk-path=<(final_apk_path_no_extension)-density-xxhdpi.apk', + '--split-apk-path=<(final_apk_path_no_extension)-density-tvdpi.apk', + ], + }], ], }, ], }], + ['create_density_splits == 1', { + 'actions': [ + { + 'action_name': 'finalize_density_splits', + 'variables': { + 'density_splits': 1, + }, + 'includes': [ 'android/finalize_splits_action.gypi'] + }, + ], + }], ['is_test_apk == 1', { 'dependencies': [ '<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands', |