From 1d27039612b68218a135fde79ab3c7565b7bd8d0 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Tue, 6 Mar 2012 22:48:43 +0000 Subject: [PATCH] Disable CreateWindowManagerForCurrentPlatform on android Review URL: https://webrtc-codereview.appspot.com/436003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1852 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../test/auto_test/helpers/vie_window_creator.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video_engine/test/auto_test/helpers/vie_window_creator.cc b/src/video_engine/test/auto_test/helpers/vie_window_creator.cc index 40ec0bb0ed..d3b44a9e23 100644 --- a/src/video_engine/test/auto_test/helpers/vie_window_creator.cc +++ b/src/video_engine/test/auto_test/helpers/vie_window_creator.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 @@ -21,8 +21,10 @@ #endif ViEWindowCreator::ViEWindowCreator() { +#ifndef WEBRTC_ANDROID window_manager_ = ViEWindowManagerFactory::CreateWindowManagerForCurrentPlatform(); +#endif } ViEWindowCreator::~ViEWindowCreator() { @@ -51,4 +53,3 @@ ViEAutoTestWindowManagerInterface* void ViEWindowCreator::TerminateWindows() { window_manager_->TerminateWindows(); } -