Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1191)

Unified Diff: build/java_apk.gypi

Issue 13599002: Trigger some java_apk.gypi actions for all builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad rebase Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index c3c92414cd2335b942f400b39f99728d0094ae20..27c9c64b85b86dfade24339ac62907f67dca1c76 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -104,6 +104,7 @@
'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
'source_dir': '<(java_in_dir)/src',
'apk_install_stamp': '<(intermediate_dir)/apk_install.stamp',
+ 'strip_output_paths': [],
'apk_package_native_libs_dir': '<(intermediate_dir)/libs',
},
# Pass the jar path to the apk's "fake" jar target. This would be better as
@@ -132,7 +133,15 @@
['native_lib_target != "" 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
+ # 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_lib_target != ""', {
'variables': {
@@ -207,6 +216,7 @@
],
'outputs': [
'<(strip_stamp)',
+ '<@(strip_output_paths)',
],
'action': [
'python', '<(DEPTH)/build/android/gyp/strip_library_for_apk.py',
@@ -240,7 +250,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',
@@ -315,6 +330,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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698