Adds all unittests to android NDK-APK framework.
BUG=N/A
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1872004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4474 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 168b88e..57cda36 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -259,9 +259,10 @@
},
{
'target_name': 'modules_integrationtests',
- 'type': 'executable',
+ 'type': '<(gtest_target_type)',
'dependencies': [
'audio_coding_module',
+ 'media_file',
'rtp_rtcp',
'test_framework',
'video_codecs_test_framework',
@@ -303,6 +304,15 @@
'video_coding/codecs/test/videoprocessor_integrationtest.cc',
'video_coding/codecs/vp8/test/vp8_impl_unittest.cc',
],
+ 'conditions': [
+ # TODO(henrike): remove build_with_chromium==1 when the bots are
+ # using Chromium's buildbots.
+ ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
+ 'dependencies': [
+ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
+ ],
},
],
'conditions': [
@@ -319,7 +329,22 @@
}
],
}],
- ]
+ ],
+ 'conditions': [
+ # TODO(henrike): remove build_with_chromium==1 when the bots are using
+ # Chromium's buildbots.
+ ['build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
+ 'targets': [
+ {
+ 'target_name': 'modules_integrationtests_apk_target',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):modules_integrationtests_apk',
+ ],
+ },
+ ],
+ }],
+ ],
}], # include_tests
], # conditions
}