wingray/audio: build the audio HAL, using legacy wrappers

Change-Id: I77e5b6d6c54b73f6bf91c6d783232101adb2959c
Signed-off-by: Dima Zavin <dima@android.com>

7 files changed, 35 insertions, 17 deletions

diff --git a/libaudio/Android.mk b/libaudio/Android.mk
index 36c9696..8e8a63c 100644
--- a/libaudio/Android.mk
+++ b/libaudio/Android.mk
@@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES:=               \
+LOCAL_SRC_FILES := \
     AudioPolicyManager.cpp
 
 LOCAL_SHARED_LIBRARIES := \
@@ -12,9 +12,15 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     libmedia
 
-LOCAL_STATIC_LIBRARIES := libaudiopolicybase
+LOCAL_STATIC_LIBRARIES := \
+    libmedia_helper
 
-LOCAL_MODULE:= libaudiopolicy
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+    libaudiopolicy_legacy
+
+LOCAL_MODULE := audio_policy.stingray
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS := optional
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
   LOCAL_CFLAGS += -DWITH_A2DP
@@ -25,7 +31,9 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libaudio
+LOCAL_MODULE := audio.primary.stingray
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
@@ -33,7 +41,7 @@ LOCAL_SHARED_LIBRARIES := \
     libmedia \
     libhardware_legacy
 
-ifeq ($TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
+ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
 LOCAL_LDLIBS += -ldl
 endif
 
@@ -41,11 +49,16 @@ ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += libdl
 endif
 
-LOCAL_SRC_FILES += AudioHardware.cpp
+LOCAL_SRC_FILES += \
+    AudioHardware.cpp
 
 LOCAL_CFLAGS += -fno-short-enums
 
-LOCAL_STATIC_LIBRARIES += libaudiointerface
+LOCAL_STATIC_LIBRARIES := \
+    libmedia_helper
+
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+    libaudiohw_legacy
 
 ifeq ($(USE_PROPRIETARY_AUDIO_EXTENSIONS),true)
 LOCAL_SRC_FILES += AudioPostProcessor.cpp
@@ -64,10 +77,6 @@ LOCAL_C_INCLUDES += vendor/moto/stingray/motomm/ghdr
 LOCAL_C_INCLUDES += vendor/moto/stingray/motomm/rate_conv
 endif
 
-ifeq ($(BOARD_HAVE_BLUETOOTH),true)
-  LOCAL_SHARED_LIBRARIES += liba2dp
-endif
-
 include $(BUILD_SHARED_LIBRARY)
 
 endif # not BUILD_TINY_ANDROID
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 9011b8a..810acf8 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -32,7 +32,7 @@
 #include "AudioHardware.h"
 #include <media/AudioRecord.h>
 
-namespace android {
+namespace android_audio_legacy {
 const uint32_t AudioHardware::inputSamplingRates[] = {
     8000, 11025, 12000, 16000, 22050, 32000, 44100, 48000
 };
diff --git a/libaudio/AudioHardware.h b/libaudio/AudioHardware.h
index 9a9ddb0..76ea2f7 100644
--- a/libaudio/AudioHardware.h
+++ b/libaudio/AudioHardware.h
@@ -32,7 +32,9 @@ extern "C" {
 }
 #endif
 
-namespace android {
+namespace android_audio_legacy {
+    using android::Mutex;
+    using android::SortedVector;
 
 #include <linux/cpcap_audio.h>
 #include <linux/tegra_audio.h>
diff --git a/libaudio/AudioPolicyManager.cpp b/libaudio/AudioPolicyManager.cpp
index 42887f4..efec3e9 100644
--- a/libaudio/AudioPolicyManager.cpp
+++ b/libaudio/AudioPolicyManager.cpp
@@ -20,7 +20,7 @@
 #include "AudioPolicyManager.h"
 #include <media/mediarecorder.h>
 
-namespace android {
+namespace android_audio_legacy {
 
 
 
diff --git a/libaudio/AudioPolicyManager.h b/libaudio/AudioPolicyManager.h
index b591c1f..561e90b 100644
--- a/libaudio/AudioPolicyManager.h
+++ b/libaudio/AudioPolicyManager.h
@@ -23,7 +23,7 @@
 #include <hardware_legacy/AudioPolicyManagerBase.h>
 
 
-namespace android {
+namespace android_audio_legacy {
 
 class AudioPolicyManager: public AudioPolicyManagerBase
 {
diff --git a/libaudio/AudioPostProcessor.cpp b/libaudio/AudioPostProcessor.cpp
index 9d81654..43e86a5 100644
--- a/libaudio/AudioPostProcessor.cpp
+++ b/libaudio/AudioPostProcessor.cpp
@@ -48,7 +48,7 @@ struct timeval mtv1, mtv2, mtv3, mtv4, mtv5, mtv6, mtv7, mtv8;
 #define GETTIMEOFDAY(a,b)
 #endif
 
-namespace android {
+namespace android_audio_legacy {
 
 AudioPostProcessor::AudioPostProcessor() :
     mEcnsScratchBuf(0), mLogNumPoints(0),  mEcnsDlBuf(0), mEcnsThread(0)
diff --git a/libaudio/AudioPostProcessor.h b/libaudio/AudioPostProcessor.h
index 0d8201d..59b412d 100644
--- a/libaudio/AudioPostProcessor.h
+++ b/libaudio/AudioPostProcessor.h
@@ -18,12 +18,19 @@
 #define ANDROID_AUDIO_POST_PROCESSOR_H
 #ifdef USE_PROPRIETARY_AUDIO_EXTENSIONS
 
+#include <utils/threads.h>
+
 extern "C" {
 #include "cto_audio_mm.h"
 }
 #include "mot_acoustics.h"
 
-namespace android {
+namespace android_audio_legacy {
+    using android::Mutex;
+    using android::AutoMutex;
+    using android::Condition;
+    using android::Thread;
+    using android::sp;
 
 class AudioPostProcessor
 {