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/webrtc@4474 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/common_video/common_video.gyp b/common_video/common_video.gyp
index 05ddd9d..8be60cd 100644
--- a/common_video/common_video.gyp
+++ b/common_video/common_video.gyp
@@ -75,7 +75,7 @@
'targets': [
{
'target_name': 'common_video_unittests',
- 'type': 'executable',
+ 'type': '<(gtest_target_type)',
'dependencies': [
'common_video',
'<(DEPTH)/testing/gtest.gyp:gtest',
@@ -93,8 +93,32 @@
'msvs_disabled_warnings': [
4267, # size_t to int truncation.
],
+ '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',
+ ],
+ }],
+ ],
},
], # targets
+ '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': 'common_video_unittests_apk_target',
+ 'type': 'none',
+ 'dependencies': [
+ '<(apk_tests_path):common_video_unittests_apk',
+ ],
+ },
+ ],
+ }],
+ ],
}], # include_tests
],
-}
\ No newline at end of file
+}