generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes Chromium FYI build issue on Android.

Browse Source 
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}
This commit is contained in:
henrika 2015-05-19 11:48:51 +02:00
parent ccb49e79fd
commit 24e56e3ee8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/audio_device/audio_device_impl.h
View File

@ -195,15 +195,12 @@ public:
public: public:
int32_t Id() {return _id;} int32_t Id() {return _id;}
#if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
// Only use this acccessor for test purposes on Android. // Only use this acccessor for test purposes on Android.
AudioManager* GetAndroidAudioManagerForTest() { AudioManager* GetAndroidAudioManagerForTest() {
#if defined(WEBRTC_ANDROID)
return _audioManagerAndroid.get(); return _audioManagerAndroid.get();
#else
CHECK(false) << "Invalid usage of GetAndroidAudioManagerForTest";
return nullptr;
#endif
} }
#endif
AudioDeviceBuffer* GetAudioDeviceBuffer() { AudioDeviceBuffer* GetAudioDeviceBuffer() {
return &_audioDeviceBuffer; return &_audioDeviceBuffer;
} }
@ -223,7 +220,7 @@ private:
AudioDeviceGeneric* _ptrAudioDevice; AudioDeviceGeneric* _ptrAudioDevice;
AudioDeviceBuffer _audioDeviceBuffer; AudioDeviceBuffer _audioDeviceBuffer;
#if defined(WEBRTC_ANDROID) #if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
rtc::scoped_ptr<AudioManager> _audioManagerAndroid; rtc::scoped_ptr<AudioManager> _audioManagerAndroid;
#endif #endif
int32_t _id; int32_t _id;