From b273b601549313d69f52ab4ad23df81101f8e426 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Fri, 6 Jun 2014 18:59:30 +0000 Subject: [PATCH] ViEAutoTestAndroid: Unbreak compile by casting void* to jobject. Sure would be nice if the try fleet used both gcc _and_ clang... TBR=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20559004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6355 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_engine/test/auto_test/source/vie_autotest_android.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc index 86b9b1d3a4..ac0dd17ee2 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc @@ -21,7 +21,7 @@ int ViEAutoTestAndroid::RunAutotest(int testSelection, int subTestSelection, JavaVM* javaVM, void* env, void* context) { ViEAutoTest vieAutoTest(window1, window2); ViETest::Log("RunAutoTest(%d, %d)", testSelection, subTestSelection); - webrtc::VideoEngine::SetAndroidObjects(javaVM, context); + webrtc::VideoEngine::SetAndroidObjects(javaVM, static_cast(context)); #ifndef WEBRTC_ANDROID_OPENSLES // voice engine calls into ADM directly webrtc::VoiceEngine::SetAndroidObjects(javaVM, env, context);