diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-10 02:18:13 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-10 02:18:13 +0000 |
| commit | 100df2922cb1259fd948e79d702cc2b7748eb824 (patch) | |
| tree | c5b63ce4b002c401dab60d615f1e337a619fdf2e /sandbox | |
| parent | e666228d174da3633cefb379b6cdfdb62351c846 (diff) | |
| download | chromium_src-100df2922cb1259fd948e79d702cc2b7748eb824.zip chromium_src-100df2922cb1259fd948e79d702cc2b7748eb824.tar.gz chromium_src-100df2922cb1259fd948e79d702cc2b7748eb824.tar.bz2 | |
android: Require exe unittests to have a foo_unittest_stripped target.
This allows the test runner to not depend on the STRIP env var, which is going away.
Other approaches considered:
1. Converting the remaining exe-based tests to apk tests. The apk versions
were slower, and didn't pass without other changes though.
2. Just don't strip. But that slows down these two tests by over 100%
(due to copying data to the device is slow, and stripped size is 0.5MB while
unstripped size is on the order of 10MB).
3. Try to get a trip binary from third_party/android_tools/ndk. That's fiddly
since it requires getting the right arch.
Since there are only two exe-based tests left, just strip them from gyp.
Medium-term, maybe gyp/mac's postbuild stuff can be brought to android,
it looks like there are various things that could be made simpler with that.
BUG=142642
TEST=
build/android/test_runner.py gtest -s sandbox_linux_unittests &&
build/android/test_runner.py gtest -s breakpad_unittests
R=bulach@chromium.org, frankf@chromium.org
TBR=jln, thestig
Review URL: https://codereview.chromium.org/157743004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/linux/sandbox_linux.gypi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi index 77a066a..21c0401 100644 --- a/sandbox/linux/sandbox_linux.gypi +++ b/sandbox/linux/sandbox_linux.gypi @@ -253,6 +253,21 @@ }, ], 'conditions': [ + [ 'OS=="android"', { + 'targets': [ + { + 'target_name': 'sandbox_linux_unittests_stripped', + 'type': 'none', + 'dependencies': [ 'sandbox_linux_unittests' ], + 'actions': [{ + 'action_name': 'strip sandbox_linux_unittests', + 'inputs': [ '<(PRODUCT_DIR)/sandbox_linux_unittests' ], + 'outputs': [ '<(PRODUCT_DIR)/sandbox_linux_unittests_stripped' ], + 'action': [ '<(android_strip)', '<@(_inputs)', '-o', '<@(_outputs)' ], + }], + } + ], + }], # Strategy copied from base_unittests_apk in base/base.gyp. [ 'OS=="android" and gtest_target_type == "shared_library"', { 'targets': [ |