Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index f1efacce939cdf06835bb69ce55c4d0b74e5713a..a877dc101c0e9d9420705cd3d94d61b8df7091bd 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -102,6 +102,7 @@ |
'codegen_input_paths': [], |
'final_apk_path': '<(PRODUCT_DIR)/apks/<(apk_name).apk', |
'apk_install_stamp': '<(intermediate_dir)/apk_install.stamp', |
+ 'strip_output_paths': [], |
}, |
# 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 |
@@ -129,7 +130,15 @@ |
['native_libs_paths != [] and component == "shared_library"', { |
'dependencies': [ |
'<(DEPTH)/build/android/setup.gyp:copy_system_libraries', |
- ] |
+ ], |
+ 'variables': { |
+ # Add a fake output to force the build to always re-run this step. This |
Yaron
2013/04/04 20:24:23
Can you inline this like the other variables? Nice
cjhopman
2013/04/04 21:13:19
This one has run even if it isn't a managed_instal
Yaron
2013/04/10 20:37:13
Can you file/link to a bug to remove this when it
|
+ # is required because the real inputs are not known at gyp-time and |
+ # changing base.so may not trigger changes to dependent libraries. |
+ 'strip_output_paths': [ |
+ '<(intermediate_dir)/<(strip_stamp).fake', |
+ ], |
+ }, |
}], |
['native_libs_paths != []', { |
'variables': { |
@@ -203,6 +212,7 @@ |
], |
'outputs': [ |
'<(strip_stamp)', |
+ '<@(strip_output_paths)', |
], |
'action': [ |
'python', '<(DEPTH)/build/android/gyp/strip_library_for_apk.py', |
@@ -235,7 +245,12 @@ |
'<(strip_stamp)', |
], |
'outputs': [ |
- '<(push_stamp)' |
+ '<(push_stamp)', |
+ # If a user switches the connected device, new libraries may |
+ # need to be pushed even if there have been no changes. To |
+ # ensure that the libraries on the device are always |
+ # up-to-date, this step should always be triggered. |
+ '<(push_stamp).fake', |
], |
'action': [ |
'python', '<(DEPTH)/build/android/gyp/push_libraries.py', |
@@ -308,6 +323,11 @@ |
], |
'outputs': [ |
'<(apk_install_stamp)' |
+ # If a user switches the connected device, the APK may need to be |
+ # installed even if there have been no changes. To ensure that the |
+ # APK on the device is always up-to-date, this step should always |
+ # be triggered. |
+ '<(apk_install_stamp).fake', |
], |
'action': [ |
'python', '<(DEPTH)/build/android/gyp/apk_install.py', |