admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(landing) Exclude VoiceEngine::SetAndroidObjects in WebRTC chrome builds

Browse Source 
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
This commit is contained in:
henrika@webrtc.org 2014-04-09 13:04:12 +00:00
parent 7ecc142d6b
commit 8883a0f47f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/voice_engine/include/voe_base.h
View File

@ -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() {}

4
webrtc/voice_engine/voice_engine_impl.cc
View File

@ -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