| Index: tools/android/forwarder2/forwarder.gyp
 | 
| diff --git a/tools/android/forwarder2/forwarder.gyp b/tools/android/forwarder2/forwarder.gyp
 | 
| index db21208a784406c170dde1b7da65fa68103afe63..ddf36beb7a8090be9e20784053e06b7d9faec53a 100644
 | 
| --- a/tools/android/forwarder2/forwarder.gyp
 | 
| +++ b/tools/android/forwarder2/forwarder.gyp
 | 
| @@ -11,6 +11,13 @@
 | 
|          'device_forwarder',
 | 
|          'host_forwarder#host',
 | 
|        ],
 | 
| +      # For the component build, ensure dependent shared libraries are stripped
 | 
| +      # and put alongside forwarder to simplify pushing to the device.
 | 
| +      'variables': {
 | 
| +         'output_dir': '<(PRODUCT_DIR)/forwarder_dist/',
 | 
| +         'native_binary': '<(PRODUCT_DIR)/device_forwarder',
 | 
| +      },
 | 
| +      'includes': ['../../../build/android/native_app_dependencies.gypi'],
 | 
|      },
 | 
|      {
 | 
|        'target_name': 'device_forwarder',
 | 
| 
 |