From 8883a0f47fa22fa8194c8afb23006610e2c647ab Mon Sep 17 00:00:00 2001 From: "henrika@webrtc.org" Date: Wed, 9 Apr 2014 13:04:12 +0000 Subject: [PATCH] (landing) Exclude VoiceEngine::SetAndroidObjects in WebRTC chrome builds Landing https://webrtc-codereview.appspot.com/11419004/ manually. TBR=niklase BUG=none Review URL: https://webrtc-codereview.appspot.com/11439005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5872 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/voice_engine/include/voe_base.h | 2 ++ webrtc/voice_engine/voice_engine_impl.cc | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h index c8db8c63d9..93dfcca13a 100644 --- a/webrtc/voice_engine/include/voe_base.h +++ b/webrtc/voice_engine/include/voe_base.h @@ -85,7 +85,9 @@ public: // receives callbacks for generated trace messages. static int SetTraceCallback(TraceCallback* callback); +#if !defined(WEBRTC_CHROMIUM_BUILD) static int SetAndroidObjects(void* javaVM, void* env, void* context); +#endif protected: VoiceEngine() {} diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc index 4c02d8d23c..2f524bb012 100644 --- a/webrtc/voice_engine/voice_engine_impl.cc +++ b/webrtc/voice_engine/voice_engine_impl.cc @@ -12,9 +12,11 @@ #include "webrtc/modules/audio_device/android/audio_device_template.h" #include "webrtc/modules/audio_device/android/audio_record_jni.h" #include "webrtc/modules/audio_device/android/audio_track_jni.h" +#if !defined(WEBRTC_CHROMIUM_BUILD) #include "webrtc/modules/audio_device/android/opensles_input.h" #include "webrtc/modules/audio_device/android/opensles_output.h" #endif +#endif #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/system_wrappers/interface/trace.h" @@ -151,6 +153,7 @@ bool VoiceEngine::Delete(VoiceEngine*& voiceEngine) return true; } +#if !defined(WEBRTC_CHROMIUM_BUILD) int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) { #ifdef WEBRTC_ANDROID @@ -171,5 +174,6 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context) return -1; #endif } +#endif } // namespace webrtc