From 77fe431f572156e0ae7d543b174800b7dae41f73 Mon Sep 17 00:00:00 2001
From: "leozwang@webrtc.org"
 <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Tue, 6 Mar 2012 20:59:55 +0000
Subject: [PATCH] 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
---
 .../video_render/main/source/video_render.gypi    |  1 +
 .../video_render/main/test/testAPI/testAPI.cc     |  6 +++---
 .../main/test/testAPI/testAPI_android.cc          | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 src/modules/video_render/main/test/testAPI/testAPI_android.cc

diff --git a/src/modules/video_render/main/source/video_render.gypi b/src/modules/video_render/main/source/video_render.gypi
index 7f9965a65..414f99a15 100644
--- a/src/modules/video_render/main/source/video_render.gypi
+++ b/src/modules/video_render/main/source/video_render.gypi
@@ -179,6 +179,7 @@
           'sources': [
             '../test/testAPI/testAPI.cc',
             '../test/testAPI/testAPI.h',
+            '../test/testAPI/testAPI_android.cc',
             '../test/testAPI/testAPI_mac.mm',
           ],
           'conditions': [
diff --git a/src/modules/video_render/main/test/testAPI/testAPI.cc b/src/modules/video_render/main/test/testAPI/testAPI.cc
index 607a86626..66c1dac70 100644
--- a/src/modules/video_render/main/test/testAPI/testAPI.cc
+++ b/src/modules/video_render/main/test/testAPI/testAPI.cc
@@ -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;
diff --git a/src/modules/video_render/main/test/testAPI/testAPI_android.cc b/src/modules/video_render/main/test/testAPI/testAPI_android.cc
new file mode 100644
index 000000000..c62a62f39
--- /dev/null
+++ b/src/modules/video_render/main/test/testAPI/testAPI_android.cc
@@ -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;
+}