Enable video render test on android
Review URL: https://webrtc-codereview.appspot.com/428006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1849 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
0975d2158c
commit
77fe431f57
@ -179,6 +179,7 @@
|
||||
'sources': [
|
||||
'../test/testAPI/testAPI.cc',
|
||||
'../test/testAPI/testAPI.h',
|
||||
'../test/testAPI/testAPI_android.cc',
|
||||
'../test/testAPI/testAPI_mac.mm',
|
||||
],
|
||||
'conditions': [
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
||||
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
@ -654,10 +654,10 @@ void RunVideoRenderTests(void* window, VideoRenderType windowType) {
|
||||
// Note: The Mac main is implemented in testApi_mac.mm.
|
||||
#if defined(_WIN32)
|
||||
int _tmain(int argc, _TCHAR* argv[])
|
||||
#elif defined(WEBRTC_LINUX)
|
||||
#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
|
||||
int main(int argc, char* argv[])
|
||||
#endif
|
||||
#if !defined(WEBRTC_MAC)
|
||||
#if !defined(WEBRTC_MAC) && !defined(WEBRTC_ANDROID)
|
||||
{
|
||||
// Create a window for testing.
|
||||
void* window = NULL;
|
||||
|
@ -0,0 +1,15 @@
|
||||
/*
|
||||
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
// TODO(leozwang): Video render test app is not ready on android,
|
||||
// make it dummy test now, will add android specific tests
|
||||
return 0;
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user