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

Unified Diff: build/android/strip_native_libraries.gypi

Issue 14057015: [Android] Fix null-build broken by https://codereview.chromium.org/14322004/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/android/strip_native_libraries.gypi
diff --git a/build/android/strip_native_libraries.gypi b/build/android/strip_native_libraries.gypi
index bcf282f9e102f3afcf1ef4bcfecb67a778382bb5..55f68265ced28c6922e4473cefc6f9a80c95ab16 100644
--- a/build/android/strip_native_libraries.gypi
+++ b/build/android/strip_native_libraries.gypi
@@ -9,6 +9,7 @@
# {
# 'actions': [
# 'variables': {
+# 'intermediate_dir': 'location to place intermediate build artifcats'
# 'ordered_libraries_file': 'file generated by write_ordered_libraries'
# 'strip_stamp': 'file to touch when the action is complete'
# 'stripped_libraries_dir': 'directory to store stripped libraries',
@@ -26,12 +27,24 @@
'<(DEPTH)/build/android/gyp/strip_library_for_device.py',
'<(ordered_libraries_file)'
],
+ 'variables': {
+ 'strip_output_paths': [],
+ 'conditions': [
+ ['component == "shared_library"', {
+ # 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.
+ 'variables': {
+ 'strip_output_paths': [
+ '<(intermediate_dir)/<(strip_stamp).fake',
+ ],
+ },
+ }],
+ ],
+ },
'outputs': [
'<(strip_stamp)',
- # 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_stamp).fake',
+ '<@(strip_output_paths)',
],
'action': [
'python', '<(DEPTH)/build/android/gyp/strip_library_for_device.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