| Index: build/java_apk.gypi
|
| diff --git a/build/java_apk.gypi b/build/java_apk.gypi
|
| index 27de9d86054963c2e0f2c157a99f9576489e2f67..f7951194d1ca3370168c4623f3ad53765328d9d7 100644
|
| --- a/build/java_apk.gypi
|
| +++ b/build/java_apk.gypi
|
| @@ -98,6 +98,8 @@
|
| 'dex_path': '<(intermediate_dir)/classes.dex',
|
| 'android_manifest': '<(java_in_dir)/AndroidManifest.xml',
|
| 'codegen_input_paths': [],
|
| + 'final_apk_path': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
|
| + 'apk_install_stamp': '<(intermediate_dir)/apk_install.stamp',
|
| },
|
| # Pass the jar path to the apk's "fake" jar target. This would be better as
|
| # direct_dependent_settings, but a variable set by a direct_dependent_settings
|
| @@ -233,6 +235,28 @@
|
| },
|
| ],
|
| }],
|
| + ['gyp_managed_install == 1', {
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'apk_install_<(_target_name)',
|
| + 'message': 'Installing <(apk_name).apk',
|
| + 'inputs': [
|
| + '<(DEPTH)/build/android/pylib/build_utils.py',
|
| + '<(DEPTH)/build/android/gyp/apk_install.py',
|
| + '<(final_apk_path)',
|
| + ],
|
| + 'outputs': [
|
| + '<(apk_install_stamp)'
|
| + ],
|
| + 'action': [
|
| + 'python', '<(DEPTH)/build/android/gyp/apk_install.py',
|
| + '--android-sdk-tools=<(android_sdk_tools)',
|
| + '--apk-path=<(final_apk_path)',
|
| + '--stamp=<(apk_install_stamp)'
|
| + ],
|
| + },
|
| + ],
|
| + }],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -438,7 +462,7 @@
|
| }],
|
| ],
|
| 'outputs': [
|
| - '<(PRODUCT_DIR)/apks/<(apk_name).apk',
|
| + '<(final_apk_path)',
|
| ],
|
| 'action': [
|
| 'ant', '-quiet',
|
|
|