liboboe: rename Oboe to AAudio
All of the edits were done using scripts in media/liboboe/scripts.
The conversion is done using SED, which is called from
convert_oboe_aaudio.sh
The conversion can be reverted when debugging using revert_all_aaudio.sh
The string substitutions are in oboe_to_aaudio.sed
Bug: 34749573
Test: cts/tests/tests/nativemedia/aaudio
Change-Id: Ia10b34472a90df2652b87607c99156e9084e57aa
Signed-off-by: Phil Burk <philburk@google.com>
diff --git a/media/liboboe/src/Android.mk b/media/liboboe/src/Android.mk
index 59edcb2..a508be3 100644
--- a/media/liboboe/src/Android.mk
+++ b/media/liboboe/src/Android.mk
@@ -1,15 +1,15 @@
LOCAL_PATH:= $(call my-dir)
# ======================= STATIC LIBRARY ==========================
-# This is being built because it make Oboe testing very easy with a complete executable.
+# This is being built because it make AAudio testing very easy with a complete executable.
# TODO Remove this target later, when not needed.
include $(CLEAR_VARS)
LOCAL_MODULE := liboboe
LOCAL_MODULE_TAGS := optional
-LIBOBOE_DIR := $(TOP)/frameworks/av/media/liboboe
-LIBOBOE_SRC_DIR := $(LIBOBOE_DIR)/src
+LIBAAUDIO_DIR := $(TOP)/frameworks/av/media/liboboe
+LIBAAUDIO_SRC_DIR := $(LIBAAUDIO_DIR)/src
LOCAL_C_INCLUDES := \
$(call include-path-for, audio-utils) \
@@ -29,11 +29,11 @@
LOCAL_SRC_FILES = \
core/AudioStream.cpp \
core/AudioStreamBuilder.cpp \
- core/OboeAudio.cpp \
+ core/AAudioAudio.cpp \
legacy/AudioStreamRecord.cpp \
legacy/AudioStreamTrack.cpp \
utility/HandleTracker.cpp \
- utility/OboeUtilities.cpp \
+ utility/AAudioUtilities.cpp \
fifo/FifoBuffer.cpp \
fifo/FifoControllerBase.cpp \
client/AudioEndpoint.cpp \
@@ -43,16 +43,16 @@
binding/SharedRegionParcelable.cpp \
binding/RingBufferParcelable.cpp \
binding/AudioEndpointParcelable.cpp \
- binding/OboeStreamRequest.cpp \
- binding/OboeStreamConfiguration.cpp \
- binding/IOboeAudioService.cpp
+ binding/AAudioStreamRequest.cpp \
+ binding/AAudioStreamConfiguration.cpp \
+ binding/IAAudioService.cpp
LOCAL_CFLAGS += -Wno-unused-parameter -Wall -Werror
# By default, all symbols are hidden.
# LOCAL_CFLAGS += -fvisibility=hidden
-# OBOE_API is used to explicitly export a function or a variable as a visible symbol.
-LOCAL_CFLAGS += -DOBOE_API='__attribute__((visibility("default")))'
+# AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.
+LOCAL_CFLAGS += -DAAUDIO_API='__attribute__((visibility("default")))'
include $(BUILD_STATIC_LIBRARY)
@@ -78,11 +78,11 @@
LOCAL_SRC_FILES = core/AudioStream.cpp \
core/AudioStreamBuilder.cpp \
- core/OboeAudio.cpp \
+ core/AAudioAudio.cpp \
legacy/AudioStreamRecord.cpp \
legacy/AudioStreamTrack.cpp \
utility/HandleTracker.cpp \
- utility/OboeUtilities.cpp \
+ utility/AAudioUtilities.cpp \
fifo/FifoBuffer.cpp \
fifo/FifoControllerBase.cpp \
client/AudioEndpoint.cpp \
@@ -92,16 +92,16 @@
binding/SharedRegionParcelable.cpp \
binding/RingBufferParcelable.cpp \
binding/AudioEndpointParcelable.cpp \
- binding/OboeStreamRequest.cpp \
- binding/OboeStreamConfiguration.cpp \
- binding/IOboeAudioService.cpp
+ binding/AAudioStreamRequest.cpp \
+ binding/AAudioStreamConfiguration.cpp \
+ binding/IAAudioService.cpp
LOCAL_CFLAGS += -Wno-unused-parameter -Wall -Werror
# By default, all symbols are hidden.
# LOCAL_CFLAGS += -fvisibility=hidden
-# OBOE_API is used to explicitly export a function or a variable as a visible symbol.
-LOCAL_CFLAGS += -DOBOE_API='__attribute__((visibility("default")))'
+# AAUDIO_API is used to explicitly export a function or a variable as a visible symbol.
+LOCAL_CFLAGS += -DAAUDIO_API='__attribute__((visibility("default")))'
LOCAL_SHARED_LIBRARIES := libaudioclient liblog libcutils libutils libbinder