rtc_unittests on Android

BUG=4364
R=pbos@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42549004

Cr-Commit-Position: refs/heads/master@{#8587}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8587 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2015-03-04 08:47:39 +00:00
parent c98f6f368a
commit 7572d85aa8
4 changed files with 35 additions and 1 deletions

View File

@ -37,6 +37,7 @@ def main():
'common_video_unittests',
'modules_tests',
'modules_unittests',
'rtc_unittests',
'system_wrappers_unittests',
'test_support_unittests',
'tools_unittests',
@ -58,6 +59,7 @@ def main():
'webrtc/common_video/common_video_unittests.isolate',
'modules_tests': 'webrtc/modules/modules_tests.isolate',
'modules_unittests': 'webrtc/modules/modules_unittests.isolate',
'rtc_unittests': 'webrtc/rtc_unittests.isolate',
'system_wrappers_unittests':
'webrtc/system_wrappers/system_wrappers_unittests.isolate',
'test_support_unittests': 'webrtc/test/test_support_unittests.isolate',

View File

@ -88,6 +88,20 @@
'../../build/apk_test.gypi',
],
},
{
'target_name': 'rtc_unittests_apk',
'type': 'none',
'variables': {
'test_suite_name': 'rtc_unittests',
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)rtc_unittests<(SHARED_LIB_SUFFIX)',
},
'dependencies': [
'<(webrtc_root)/webrtc.gyp:rtc_unittests',
],
'includes': [
'../../build/apk_test.gypi',
],
},
{
'target_name': 'system_wrappers_unittests_apk',
'type': 'none',

View File

@ -29,6 +29,10 @@
'target_name': 'modules_unittests_apk',
'type': 'none',
},
{
'target_name': 'rtc_unittests_apk',
'type': 'none',
},
{
'target_name': 'system_wrappers_unittests_apk',
'type': 'none',

View File

@ -9,7 +9,7 @@
'targets': [
{
'target_name': 'rtc_unittests',
'type': 'executable',
'type': '<(gtest_target_type)',
'dependencies': [
'base/base.gyp:rtc_base',
'base/base_tests.gyp:rtc_base_tests_utils',
@ -24,6 +24,13 @@
'sound/sound.gyp:rtc_sound',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'conditions': [
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],
}],
],
},
{
'target_name': 'webrtc_tests',
@ -202,6 +209,13 @@
'conditions': [
['OS=="android"', {
'targets': [
{
'target_name': 'rtc_unittests_apk_target',
'type': 'none',
'dependencies': [
'<(apk_tests_path):rtc_unittests_apk',
],
},
{
'target_name': 'video_engine_tests_apk_target',
'type': 'none',