diff options
author | jbudorick <jbudorick@chromium.org> | 2016-01-15 17:21:51 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-16 01:23:53 +0000 |
commit | 070dd8c416495cb051617b05681353e096c463b7 (patch) | |
tree | ba18422b1d9700af664abf1459ae2d450c92a9ce /build/java_apk.gypi | |
parent | 5f578079ddfe10de97b27d179d0c2b1718d119c3 (diff) | |
download | chromium_src-070dd8c416495cb051617b05681353e096c463b7.zip chromium_src-070dd8c416495cb051617b05681353e096c463b7.tar.gz chromium_src-070dd8c416495cb051617b05681353e096c463b7.tar.bz2 |
[Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND 2)
this is a reland of https://codereview.chromium.org/1590243003/
BUG=272790
TBR=thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1594653002
Cr-Commit-Position: refs/heads/master@{#369906}
Diffstat (limited to 'build/java_apk.gypi')
-rw-r--r-- | build/java_apk.gypi | 53 |
1 files changed, 43 insertions, 10 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index ab49dc6..f8e5231 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -77,6 +77,7 @@ 'tested_apk_obfuscated_jar_path%': '/', 'tested_apk_dex_path%': '/', 'tested_apk_is_multidex%': 0, + 'tested_apk_generated_multidex_config%': 0, 'additional_input_paths': [], 'additional_locale_input_paths': [], 'create_density_splits%': 0, @@ -121,6 +122,11 @@ 'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/', 'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h', 'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h', + 'generate_multidex_config%': 0, + 'multidex_config_template': '<(DEPTH)/base/android/java/templates/ChromiumMultiDex.template', + 'multidex_config_java_dir': '<(intermediate_dir)/multidex_config/', + 'multidex_config_java_file': '<(multidex_config_java_dir)/ChromiumMultiDex.java', + 'multidex_config_java_stamp': '<(intermediate_dir)/multidex_config_java.stamp', 'compile_stamp': '<(intermediate_dir)/compile.stamp', 'lint_stamp': '<(intermediate_dir)/lint.stamp', 'lint_result': '<(intermediate_dir)/lint_result.xml', @@ -266,6 +272,7 @@ 'tested_apk_obfuscated_jar_path': '<(obfuscated_jar_path)', 'tested_apk_dex_path': '<(dex_path)', 'tested_apk_is_multidex': '<(enable_multidex)', + 'tested_apk_generated_multidex_config': '>(generate_multidex_config)', } }] ], @@ -794,37 +801,58 @@ }, ], }], - ['enable_multidex == 1', { + ], + 'target_conditions': [ + ['generate_multidex_config == 1 and tested_apk_generated_multidex_config == 0', { + 'variables': { + 'generated_src_dirs': ['<(multidex_config_java_dir)'], + }, 'actions': [ { - 'action_name': 'main_dex_list_for_<(_target_name)', - 'variables': { - 'jar_paths': ['>@(input_jars_paths)', '<(javac_jar_path)'], - 'output_path': '<(main_dex_list_path)', - }, - 'includes': [ 'android/main_dex_action.gypi' ], - }, - { 'action_name': 'configure_multidex_for_<(_target_name)', 'inputs': [ '<(DEPTH)/build/android/gyp/configure_multidex.py', + '<(multidex_config_template)', ], 'outputs': [ '<(multidex_configuration_path)', + '<(multidex_config_java_stamp)', ], 'variables': { 'additional_multidex_config_options': [], - 'enabled_configurations': ['>@(enable_multidex_configurations)'], + 'enabled_configurations': '>(enable_multidex_configurations)', + 'conditions': [ + ['enable_multidex == 1', { + 'additional_multidex_config_options': ['--enable-multidex'], + }], + ], }, 'action': [ 'python', '<(DEPTH)/build/android/gyp/configure_multidex.py', '--configuration-name', '<(CONFIGURATION_NAME)', '--enabled-configurations', '<(enabled_configurations)', '--multidex-configuration-path', '<(multidex_configuration_path)', + '--multidex-config-java-template', '<(multidex_config_template)', + '--multidex-config-java-file', '<(multidex_config_java_file)', + '--multidex-config-java-stamp', '<(multidex_config_java_stamp)', '>@(additional_multidex_config_options)', ], }, ], + 'conditions': [ + ['enable_multidex == 1', { + 'actions': [ + { + 'action_name': 'main_dex_list_for_<(_target_name)', + 'variables': { + 'jar_paths': ['>@(input_jars_paths)', '<(javac_jar_path)'], + 'output_path': '<(main_dex_list_path)', + }, + 'includes': [ 'android/main_dex_action.gypi' ], + }, + ] + }] + ], }], ], 'dependencies': [ @@ -956,6 +984,11 @@ 'inputs': [ '<(native_libraries_java_stamp)' ], }], ], + 'target_conditions': [ + ['generate_multidex_config == 1 and tested_apk_generated_multidex_config == 0', { + 'inputs': [ '<(multidex_config_java_stamp)' ], + }], + ], 'outputs': [ '<(compile_stamp)', '<(javac_jar_path)', |