[Android] Fix null-build broken by https://codereview.chromium.org/14322004/

The change unintentionally made the "always re-run strip" logic apply to
non-component build as well. Restored the original logic.

BUG=158821
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/14057015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194991 0039d316-1c4b-4281-b951-d872f2087c98
parent 958d2976
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
# { # {
# 'actions': [ # 'actions': [
# 'variables': { # 'variables': {
# 'intermediate_dir': 'location to place intermediate build artifcats'
# 'ordered_libraries_file': 'file generated by write_ordered_libraries' # 'ordered_libraries_file': 'file generated by write_ordered_libraries'
# 'strip_stamp': 'file to touch when the action is complete' # 'strip_stamp': 'file to touch when the action is complete'
# 'stripped_libraries_dir': 'directory to store stripped libraries', # 'stripped_libraries_dir': 'directory to store stripped libraries',
...@@ -26,12 +27,24 @@ ...@@ -26,12 +27,24 @@
'<(DEPTH)/build/android/gyp/strip_library_for_device.py', '<(DEPTH)/build/android/gyp/strip_library_for_device.py',
'<(ordered_libraries_file)' '<(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': [ 'outputs': [
'<(strip_stamp)', '<(strip_stamp)',
# Add a fake output to force the build to always re-run this step. This '<@(strip_output_paths)',
# 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',
], ],
'action': [ 'action': [
'python', '<(DEPTH)/build/android/gyp/strip_library_for_device.py', 'python', '<(DEPTH)/build/android/gyp/strip_library_for_device.py',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment