diff options
| author | phoglund <phoglund@webrtc.org> | 2016-01-08 05:04:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 13:05:01 +0000 |
| commit | 37ebcf0ce5ad1685bcf659ea75960beb96019647 (patch) | |
| tree | 3253e50cbc9204438e139d4356e0fe1b0d38a0b1 /talk/libjingle_tests.gyp | |
| parent | b71b4f0c7af57ef5b676c6ed70bf945282c90e3a (diff) | |
| download | webrtc-37ebcf0ce5ad1685bcf659ea75960beb96019647.tar.gz | |
Reland "Add APK targets to build libjingle tests for Android."
patchset #10 id:180001 of https://codereview.webrtc.org/1511633002/
This reverts commit bc14164aad254e72ce4d1e381b912b7d3acf5391.
We have made more preparations downstream, so this should work now. Original CL by perkj@.
BUG=webrtc:2365
The work started from the work by kjellander@ in https://codereview.webrtc.org/1413663003/
Review URL: https://codereview.webrtc.org/1570513004
Cr-Commit-Position: refs/heads/master@{#11186}
Diffstat (limited to 'talk/libjingle_tests.gyp')
| -rwxr-xr-x | talk/libjingle_tests.gyp | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index e7b354b126..1dc3649186 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -187,7 +187,7 @@ }, # target libjingle_p2p_unittest { 'target_name': 'libjingle_peerconnection_unittest', - 'type': 'executable', + 'type': '<(gtest_target_type)', 'dependencies': [ '<(DEPTH)/testing/gmock.gyp:gmock', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', @@ -218,7 +218,6 @@ # 'app/webrtc/peerconnectionproxy_unittest.cc', 'app/webrtc/remotevideocapturer_unittest.cc', 'app/webrtc/rtpsenderreceiver_unittest.cc', - 'app/webrtc/sctputils.cc', 'app/webrtc/statscollector_unittest.cc', 'app/webrtc/test/fakeaudiocapturemodule.cc', 'app/webrtc/test/fakeaudiocapturemodule.h', @@ -239,17 +238,14 @@ ], 'conditions': [ ['OS=="android"', { - # We want gmock features that use tr1::tuple, but we currently - # don't support the variadic templates used by libstdc++'s - # implementation. gmock supports this scenario by providing its - # own implementation but we must opt in to it. - 'defines': [ - 'GTEST_USE_OWN_TR1_TUPLE=1', - # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set. - # gmock r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0 - # automatically on android, so it has to be set explicitly here. - 'GTEST_HAS_TR1_TUPLE=1', - ], + 'sources': [ + 'app/webrtc/test/androidtestinitializer.cc', + 'app/webrtc/test/androidtestinitializer.h', + ], + 'dependencies': [ + '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', + 'libjingle.gyp:libjingle_peerconnection_jni', + ], }], ['OS=="win" and clang==1', { 'msvs_settings': { @@ -415,6 +411,17 @@ }, # target apprtc_signaling_gunit_test ], }], + ['OS=="android"', { + 'targets': [ + { + 'target_name': 'libjingle_peerconnection_unittest_apk_target', + 'type': 'none', + 'dependencies': [ + '<(DEPTH)/webrtc/build/apk_tests.gyp:libjingle_peerconnection_unittest_apk', + ], + }, + ], + }], ['test_isolation_mode != "noop"', { 'targets': [ { |