| Index: build/java.gypi
|
| diff --git a/build/java.gypi b/build/java.gypi
|
| index dc642b94f39e2df8b1f120c30af0e0dd0682fee3..614d50a101d492f6ce77718a08f22675a6458dac 100644
|
| --- a/build/java.gypi
|
| +++ b/build/java.gypi
|
| @@ -64,7 +64,6 @@
|
| '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,
|
| @@ -114,7 +113,6 @@
|
| 'variables': {
|
| 'input_jars_paths': ['<(jar_final_path)'],
|
| 'library_dexed_jars_paths': ['<(dex_path)'],
|
| - 'main_dex_list_paths': ['<(main_dex_list_path)'],
|
| },
|
| },
|
| }],
|
| @@ -311,14 +309,6 @@
|
| ]
|
| },
|
| {
|
| - 'action_name': 'main_dex_list_for_<(_target_name)',
|
| - 'variables': {
|
| - 'jar_path': '<(javac_jar_path)',
|
| - 'output_path': '<(main_dex_list_path)',
|
| - },
|
| - 'includes': [ 'android/main_dex_action.gypi' ],
|
| - },
|
| - {
|
| 'action_name': 'instr_jar_<(_target_name)',
|
| 'message': 'Instrumenting <(_target_name) jar',
|
| 'variables': {
|
|
|