Bug 938070: Fix misplaced #ifdef for GONK in webrtc audio_device_impl from 3.43 merge r=jesup
authorRandell Jesup <rjesup@jesup.org>
Fri, 15 Nov 2013 11:33:18 -0500
changeset 169462 fb9f3b754d03191cd5d0db8ecc48df0ba1317b37
parent 169461 80a06bfe83e7fc7839e1f5864567432d9c3802f4
child 169463 583a811bd60b63748623d6e35d64f665c02df3c9
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs938070
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 938070: Fix misplaced #ifdef for GONK in webrtc audio_device_impl from 3.43 merge r=jesup
media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
--- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc
@@ -287,23 +287,23 @@ int32_t AudioDeviceModuleImpl::CreatePla
         // Create the *Android Java* implementation of the Audio Device
         if (audioLayer == kPlatformDefaultAudio)
         {
             // Create *Android JNI Audio* implementation
             ptrAudioDevice = new AudioDeviceAndroidJni(Id());
             WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "Android JNI Audio APIs will be utilized");
         }
     }
-
+#endif
     if (ptrAudioDevice != NULL)
     {
       // Create the Android implementation of the Device Utility.
       ptrAudioDeviceUtility = new AudioDeviceUtilityAndroid(Id());
     }
-#endif
+
     // Create the *Linux* implementation of the Audio Device
     //
 #elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
     if ((audioLayer == kLinuxPulseAudio) || (audioLayer == kPlatformDefaultAudio))
     {
 #if defined(LINUX_PULSE)
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "attempting to use the Linux PulseAudio APIs...");