diff options
author | jbudorick <jbudorick@chromium.org> | 2016-01-15 14:21:14 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 22:22:31 +0000 |
commit | 1c4276c2ef480164f6cef4d79e98ffcebadea44d (patch) | |
tree | e43a39de74fb9c479c5aff06e499605c43a73ff9 /build/java_apk.gypi | |
parent | d446934dfd458b7492414ace4c75947eb60d079e (diff) | |
download | chromium_src-1c4276c2ef480164f6cef4d79e98ffcebadea44d.zip chromium_src-1c4276c2ef480164f6cef4d79e98ffcebadea44d.tar.gz chromium_src-1c4276c2ef480164f6cef4d79e98ffcebadea44d.tar.bz2 |
Revert of [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND) (patchset #2 id:20001 of https://codereview.chromium.org/1590243003/ )
Reason for revert:
mysterious compile errors on Android appeared two builds after this landed.
https://build.chromium.org/p/chromium/builders/Android/builds/50690
Original issue's description:
> [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND)
>
> This is a reland of https://codereview.chromium.org/1581563003
>
> BUG=272790
> TBR=thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org
>
> Committed: https://crrev.com/ab450c5ede0635194331286088d0f488f4086ba5
> Cr-Commit-Position: refs/heads/master@{#369815}
TBR=agrieve@chromium.org,thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=272790
Review URL: https://codereview.chromium.org/1587673014
Cr-Commit-Position: refs/heads/master@{#369864}
Diffstat (limited to 'build/java_apk.gypi')
-rw-r--r-- | build/java_apk.gypi | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 57d8558..ab49dc6 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -77,7 +77,6 @@ '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, @@ -122,11 +121,6 @@ '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', @@ -272,7 +266,6 @@ '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)', } }] ], @@ -801,58 +794,37 @@ }, ], }], - ], - 'target_conditions': [ - ['generate_multidex_config == 1 and tested_apk_generated_multidex_config == 0', { - 'variables': { - 'generated_src_dirs': ['<(multidex_config_java_dir)'], - }, + ['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' ], + }, + { '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)', - 'conditions': [ - ['enable_multidex == 1', { - 'additional_multidex_config_options': ['--enable-multidex'], - }], - ], + 'enabled_configurations': ['>@(enable_multidex_configurations)'], }, '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': [ @@ -983,9 +955,6 @@ ['native_lib_target != ""', { 'inputs': [ '<(native_libraries_java_stamp)' ], }], - ['generate_multidex_config == 1', { - 'inputs': [ '<(multidex_config_java_stamp)' ], - }], ], 'outputs': [ '<(compile_stamp)', |