Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index f1efacce939cdf06835bb69ce55c4d0b74e5713a..5c349137bd4e35d1ba2cf4a90aee015402e10bfd 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -266,6 +266,7 @@ |
}, |
], |
}, { |
+ # gyp_managed_install != 1 |
'variables': { |
'apk_libraries_dir': '<(intermediate_dir)/libs/<(android_app_abi)', |
'package_input_paths': [ '<(strip_stamp)' ], |
@@ -333,6 +334,8 @@ |
], |
'inputs': [ |
'<(DEPTH)/build/android/ant/apk-codegen.xml', |
+ '<(DEPTH)/build/android/gyp/util/build_utils.py', |
+ '<(DEPTH)/build/android/gyp/ant.py', |
'<(android_manifest)', |
'>@(library_manifest_paths)' |
'>@(codegen_input_paths)', |
@@ -342,7 +345,8 @@ |
'<(codegen_stamp)', |
], |
'action': [ |
- 'ant', '-quiet', |
+ 'python', '<(DEPTH)/build/android/gyp/ant.py', |
+ '-quiet', |
'-DADDITIONAL_RES_DIRS=>(additional_res_dirs)', |
'-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)', |
'-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)', |
@@ -431,6 +435,8 @@ |
'inputs': [ |
'<(DEPTH)/build/android/ant/apk-obfuscate.xml', |
'<(DEPTH)/build/android/ant/create-test-jar.js', |
+ '<(DEPTH)/build/android/gyp/util/build_utils.py', |
+ '<(DEPTH)/build/android/gyp/ant.py', |
'<(compile_stamp)', |
'>@(proguard_flags_paths)', |
], |
@@ -438,7 +444,8 @@ |
'<(obfuscate_stamp)', |
], |
'action': [ |
- 'ant', '-quiet', |
+ 'python', '<(DEPTH)/build/android/gyp/ant.py', |
+ '-quiet', |
'-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)', |
'-DANDROID_SDK_JAR=<(android_sdk_jar)', |
'-DANDROID_SDK_ROOT=<(android_sdk_root)', |
@@ -512,6 +519,8 @@ |
'message': 'Packaging <(_target_name).', |
'inputs': [ |
'<(DEPTH)/build/android/ant/apk-package.xml', |
+ '<(DEPTH)/build/android/gyp/util/build_utils.py', |
+ '<(DEPTH)/build/android/gyp/ant.py', |
'<(dex_path)', |
'<(codegen_stamp)', |
'<(obfuscate_stamp)', |
@@ -529,7 +538,8 @@ |
'<(final_apk_path)', |
], |
'action': [ |
- 'ant', '-quiet', |
+ 'python', '<(DEPTH)/build/android/gyp/ant.py', |
+ '-quiet', |
'-DADDITIONAL_RES_DIRS=>(additional_res_dirs)', |
'-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)', |
'-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)', |
@@ -555,7 +565,6 @@ |
# (e.g. if a Java file is removed), the command will be re-run. |
# TODO(newt): remove this once crbug.com/177552 is fixed in ninja. |
'-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)', |
- |
] |
}, |
], |