Index: sandbox/linux/sandbox_linux.gypi |
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi |
index 1a742b5354ecd46574dc4887b54b1e5de91f7073..cbec4574485690ec1ef63ae5c562a4aa07a55b03 100644 |
--- a/sandbox/linux/sandbox_linux.gypi |
+++ b/sandbox/linux/sandbox_linux.gypi |
@@ -300,7 +300,7 @@ |
'conditions': [ |
[ 'OS=="android"', { |
'targets': [ |
- { |
+ { |
'target_name': 'sandbox_linux_unittests_stripped', |
'type': 'none', |
'dependencies': [ 'sandbox_linux_unittests' ], |
@@ -309,9 +309,26 @@ |
'inputs': [ '<(PRODUCT_DIR)/sandbox_linux_unittests' ], |
'outputs': [ '<(PRODUCT_DIR)/sandbox_linux_unittests_stripped' ], |
'action': [ '<(android_strip)', '<@(_inputs)', '-o', '<@(_outputs)' ], |
- }], |
- } |
- ], |
+ }], |
+ }, |
+ { |
+ 'target_name': 'sandbox_linux_unittests_deps', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'sandbox_linux_unittests_stripped', |
+ ], |
+ # For the component build, ensure dependent shared libraries are |
+ # stripped and put alongside sandbox_linux_unittests to simplify pushing |
+ # to the device. |
+ 'variables': { |
+ 'output_dir': '<(PRODUCT_DIR)/sandbox_linux_unittests_deps/', |
+ 'native_binary': '<(PRODUCT_DIR)/sandbox_linux_unittests_stripped', |
+ 'include_main_binary': 0, |
+ }, |
+ 'includes': [ |
+ '../../build/android/native_app_dependencies.gypi' |
+ ], |
+ }], |
}], |
[ 'OS=="android"', { |
'targets': [ |