Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index f8e523177fc5907d01f481a2210d25dc22d22d69..92c01fe86e1f457f1b9062494c1fd1ca2799ff34 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -122,11 +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', |
+ 'generate_chromium_build_config%': 0, |
+ 'chromium_build_config_template': '<(DEPTH)/base/android/java/templates/ChromiumBuildConfig.template', |
+ 'chromium_build_config_java_dir': '<(intermediate_dir)/chromium_build_config/', |
+ 'chromium_build_config_java_file': '<(chromium_build_config_java_dir)/ChromiumBuildConfig.java', |
+ 'chromium_build_config_java_stamp': '<(intermediate_dir)/chromium_build_config_java.stamp', |
'compile_stamp': '<(intermediate_dir)/compile.stamp', |
'lint_stamp': '<(intermediate_dir)/lint.stamp', |
'lint_result': '<(intermediate_dir)/lint_result.xml', |
@@ -272,7 +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)', |
+ 'tested_apk_generated_multidex_config': '>(generate_chromium_build_config)', |
} |
}] |
], |
@@ -803,20 +803,20 @@ |
}], |
], |
'target_conditions': [ |
- ['generate_multidex_config == 1 and tested_apk_generated_multidex_config == 0', { |
+ ['generate_chromium_build_config == 1 and tested_apk_generated_multidex_config == 0', { |
'variables': { |
- 'generated_src_dirs': ['<(multidex_config_java_dir)'], |
+ 'generated_src_dirs': ['<(chromium_build_config_java_dir)'], |
}, |
'actions': [ |
{ |
'action_name': 'configure_multidex_for_<(_target_name)', |
'inputs': [ |
'<(DEPTH)/build/android/gyp/configure_multidex.py', |
- '<(multidex_config_template)', |
+ '<(chromium_build_config_template)', |
], |
'outputs': [ |
'<(multidex_configuration_path)', |
- '<(multidex_config_java_stamp)', |
+ '<(chromium_build_config_java_stamp)', |
], |
'variables': { |
'additional_multidex_config_options': [], |
@@ -832,9 +832,9 @@ |
'--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)', |
+ '--multidex-config-java-template', '<(chromium_build_config_template)', |
+ '--multidex-config-java-file', '<(chromium_build_config_java_file)', |
+ '--multidex-config-java-stamp', '<(chromium_build_config_java_stamp)', |
'>@(additional_multidex_config_options)', |
], |
}, |
@@ -985,8 +985,8 @@ |
}], |
], |
'target_conditions': [ |
- ['generate_multidex_config == 1 and tested_apk_generated_multidex_config == 0', { |
- 'inputs': [ '<(multidex_config_java_stamp)' ], |
+ ['generate_chromium_build_config == 1 and tested_apk_generated_multidex_config == 0', { |
+ 'inputs': [ '<(chromium_build_config_java_stamp)' ], |
}], |
], |
'outputs': [ |