zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO with WEBRTC_.

Browse Source 
Since it is a WebRTC-only macro, let's prefix it with WEBRTC_.

Bug: None
Change-Id: I309666858ea898dc7cd1a68c21be190f98c87b11
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129935
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27327}
This commit is contained in:
Mirko Bonadei
2019-03-27 21:11:17 +01:00
committed by Commit Bot
parent b3ae979ecd
commit 185e802971
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/android/native_api/audio_device_module/audio_device_android.cc
View File

@ -19,7 +19,7 @@
#include "rtc_base/ref_count.h"
#include "rtc_base/ref_counted_object.h"
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#include "sdk/android/src/jni/audio_device/aaudio_player.h"
#include "sdk/android/src/jni/audio_device/aaudio_recorder.h"
#endif
@ -52,7 +52,7 @@ void GetDefaultAudioParameters(JNIEnv* env,
} // namespace
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
rtc::scoped_refptr<AudioDeviceModule> CreateAAudioAudioDeviceModule(
JNIEnv* env,
jobject application_context) {

2
sdk/android/native_api/audio_device_module/audio_device_android.h
View File

@ -17,7 +17,7 @@
namespace webrtc {
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
rtc::scoped_refptr<AudioDeviceModule> CreateAAudioAudioDeviceModule(
JNIEnv* env,
jobject application_context);