| 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', | 
|  |