| Index: build/java.gypi
|
| diff --git a/build/java.gypi b/build/java.gypi
|
| index 73c550de071e310fadb3a04d871497b1d01e6269..b63caa8e9fa18049ae898d9ff2052b53d886b57d 100644
|
| --- a/build/java.gypi
|
| +++ b/build/java.gypi
|
| @@ -64,6 +64,7 @@
|
| 'instr_stamp': '<(intermediate_dir)/instr.stamp',
|
| 'additional_input_paths': [],
|
| 'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar',
|
| + 'main_dex_list_path': '<(intermediate_dir)/main_dex_list.txt',
|
| 'generated_src_dirs': ['>@(generated_R_dirs)'],
|
| 'generated_R_dirs': [],
|
| 'has_java_resources%': 0,
|
| @@ -113,6 +114,7 @@
|
| 'variables': {
|
| 'input_jars_paths': ['<(jar_final_path)'],
|
| 'library_dexed_jars_paths': ['<(dex_path)'],
|
| + 'main_dex_list_paths': ['<(main_dex_list_path)'],
|
| },
|
| },
|
| }],
|
| @@ -297,6 +299,28 @@
|
| ]
|
| },
|
| {
|
| + 'action_name': 'main_dex_list_for_<(_target_name)',
|
| + 'variables': {
|
| + 'main_dex_list_script': '<(DEPTH)/build/android/gyp/main_dex_list.py',
|
| + 'main_dex_rules_file': '<(DEPTH)/build/android/main_dex_classes.flags',
|
| + },
|
| + 'inputs': [
|
| + '<(javac_jar_path)',
|
| + '<(main_dex_list_script)',
|
| + '<(main_dex_rules_file)',
|
| + ],
|
| + 'outputs': [
|
| + '<(main_dex_list_path)',
|
| + ],
|
| + 'action': [
|
| + 'python', '<(main_dex_list_script)',
|
| + '--android-sdk-tools', '<(android_sdk_tools)',
|
| + '--main-dex-list-path', '<(main_dex_list_path)',
|
| + '--main-dex-rules-path', '<(main_dex_rules_file)',
|
| + '<(javac_jar_path)',
|
| + ],
|
| + },
|
| + {
|
| 'action_name': 'instr_jar_<(_target_name)',
|
| 'message': 'Instrumenting <(_target_name) jar',
|
| 'variables': {
|
|
|