From 24e56e3ee8997761369784cecddac7821d89aec7 Mon Sep 17 00:00:00 2001 From: henrika Date: Tue, 19 May 2015 11:48:51 +0200 Subject: [PATCH] Fixes Chromium FYI build issue on Android. See https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Android%20Builder%20(dbg) for details BUG= R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/47219004 Cr-Commit-Position: refs/heads/master@{#9217} --- webrtc/modules/audio_device/audio_device_impl.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h index 010c537500..8e918b25b5 100644 --- a/webrtc/modules/audio_device/audio_device_impl.h +++ b/webrtc/modules/audio_device/audio_device_impl.h @@ -195,15 +195,12 @@ public: public: int32_t Id() {return _id;} +#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) // Only use this acccessor for test purposes on Android. AudioManager* GetAndroidAudioManagerForTest() { -#if defined(WEBRTC_ANDROID) return _audioManagerAndroid.get(); -#else - CHECK(false) << "Invalid usage of GetAndroidAudioManagerForTest"; - return nullptr; -#endif } +#endif AudioDeviceBuffer* GetAudioDeviceBuffer() { return &_audioDeviceBuffer; } @@ -223,7 +220,7 @@ private: AudioDeviceGeneric* _ptrAudioDevice; AudioDeviceBuffer _audioDeviceBuffer; -#if defined(WEBRTC_ANDROID) +#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) rtc::scoped_ptr _audioManagerAndroid; #endif int32_t _id;