diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-01 11:06:37 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-09-01 11:06:37 +0000 |
| commit | b9d6b2bf432a5798d629e52bcb06d18cad350fc1 (patch) | |
| tree | 47982accb80e56fbaad360e447f1461e8dcbff67 /system_wrappers/source | |
| parent | f346864545db8090802011db9a163d4f3ee26e40 (diff) | |
| download | webrtc-b9d6b2bf432a5798d629e52bcb06d18cad350fc1.tar.gz | |
Android APK tests built from a normal WebRTC checkout.
Restructure how the Android APK tests are compiled now
that we have a Chromium checkout available (since r6938).
This removes the need of several hacks that were needed when
building these targets from inside a Chromium checkout.
By creating a symlink to Chromium's base we can compile the required
targets. This also removes the need of the previously precompiled
binaries we keep in /deps/tools/android at Google code.
All the user needs to do is to add the target_os = ["android"]
entry to his .gclient as described at
https://code.google.com/p/chromium/wiki/AndroidBuildInstructions
Before committing this CL, the Android APK buildbots will need
to be updated.
This also solves http://crbug.com/402594 since the apply_svn_patch.py
usage will be similar to the other standalone bots.
It also solves http://crbug.com/399297
BUG=chromium:399297, chromium:402594
TESTED=Locally compiled all APK targets by running:
GYP_DEFINES="OS=android include_tests=1 enable_tracing=1" gclient runhooks
ninja -C out/Release
checkdeps
R=henrike@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/22149004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7014 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'system_wrappers/source')
| -rw-r--r-- | system_wrappers/source/system_wrappers_tests.gyp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/system_wrappers/source/system_wrappers_tests.gyp b/system_wrappers/source/system_wrappers_tests.gyp index 3d08c0d0..29ac6021 100644 --- a/system_wrappers/source/system_wrappers_tests.gyp +++ b/system_wrappers/source/system_wrappers_tests.gyp @@ -45,9 +45,7 @@ ['os_posix==0', { 'sources!': [ 'thread_posix_unittest.cc', ], }], - # TODO(henrike): remove build_with_chromium==1 when the bots are - # using Chromium's buildbots. - ['build_with_chromium==1 and OS=="android"', { + ['OS=="android"', { 'dependencies': [ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', ], @@ -60,15 +58,20 @@ }, ], 'conditions': [ - # TODO(henrike): remove build_with_chromium==1 when the bots are using - # Chromium's buildbots. - ['include_tests==1 and build_with_chromium==1 and OS=="android"', { + ['OS=="android"', { 'targets': [ { - 'target_name': 'system_wrappers_unittests_apk_target', + 'target_name': 'system_wrappers_unittests_apk', 'type': 'none', + 'variables': { + 'test_suite_name': 'system_wrappers_unittests', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)system_wrappers_unittests<(SHARED_LIB_SUFFIX)', + }, 'dependencies': [ - '<(apk_tests_path):system_wrappers_unittests_apk', + 'system_wrappers_unittests', + ], + 'includes': [ + '../../../build/apk_test.gypi', ], }, ], |