From b7e1f72899e7abb8416b1b76ae840c64c1c9eaaa Mon Sep 17 00:00:00 2001
From: Dima Zavin <dima@android.com>
Date: Tue, 19 Apr 2011 16:15:44 -0700
Subject: [PATCH] legacy: build legacy audio wrapper libs

Note that the legacy audio helper libs are not part of the
main libhardware_legacy lib itself.

Change-Id: Ie08343ab8de2d298db0041c711d7e02a284bc4c3
Signed-off-by: Dima Zavin <dima@android.com>
---
 Android.mk       |  5 ++++
 audio/Android.mk | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 audio/Android.mk

diff --git a/Android.mk b/Android.mk
index c382d61..83caee8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,7 @@
 legacy_modules := power uevent vibrator wifi qemu qemu_tracing
 
 SAVE_MAKEFILES := $(call all-named-subdir-makefiles,$(legacy_modules))
+LEGACY_AUDIO_MAKEFILES := $(call all-named-subdir-makefiles,audio)
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
@@ -53,3 +54,7 @@ LOCAL_SRC_FILES := power/power.c
 LOCAL_SHARED_LIBRARIES := libcutils
 
 include $(BUILD_SHARED_LIBRARY)
+
+# legacy_audio builds it's own set of libraries that aren't linked into
+# hardware_legacy
+include $(LEGACY_AUDIO_MAKEFILES)
diff --git a/audio/Android.mk b/audio/Android.mk
new file mode 100644
index 0000000..5a5a5a1
--- /dev/null
+++ b/audio/Android.mk
@@ -0,0 +1,66 @@
+# Copyright 2011 The Android Open Source Project
+
+#AUDIO_POLICY_TEST := true
+#ENABLE_AUDIO_DUMP := true
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    AudioHardwareInterface.cpp \
+    audio_hw_hal.cpp
+
+ifeq ($(BOARD_HAVE_BLUETOOTH),true)
+  LOCAL_CFLAGS += -DWITH_A2DP
+endif
+
+LOCAL_MODULE := libaudiohw_legacy
+LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_LIBRARIES := libmedia_helper
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    AudioPolicyManagerBase.cpp \
+    AudioPolicyCompatClient.cpp \
+    audio_policy_hal.cpp
+
+ifeq ($(AUDIO_POLICY_TEST),true)
+  LOCAL_CFLAGS += -DAUDIO_POLICY_TEST
+endif
+
+ifeq ($(BOARD_HAVE_BLUETOOTH),true)
+  LOCAL_CFLAGS += -DWITH_A2DP
+endif
+
+LOCAL_STATIC_LIBRARIES := libmedia_helper
+LOCAL_MODULE := libaudiopolicy_legacy
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_STATIC_LIBRARY)
+
+#ifeq ($(ENABLE_AUDIO_DUMP),true)
+#  LOCAL_SRC_FILES += AudioDumpInterface.cpp
+#  LOCAL_CFLAGS += -DENABLE_AUDIO_DUMP
+#endif
+#
+#ifeq ($(strip $(BOARD_USES_GENERIC_AUDIO)),true)
+#  LOCAL_CFLAGS += -D GENERIC_AUDIO
+#endif
+
+#ifeq ($(BOARD_HAVE_BLUETOOTH),true)
+#  LOCAL_SRC_FILES += A2dpAudioInterface.cpp
+#  LOCAL_SHARED_LIBRARIES += liba2dp
+#  LOCAL_C_INCLUDES += $(call include-path-for, bluez)
+#
+#  LOCAL_CFLAGS += \
+#      -DWITH_BLUETOOTH \
+#      -DWITH_A2DP
+#endif
+#
+#include $(BUILD_SHARED_LIBRARY)
+
+#    AudioHardwareGeneric.cpp \
+#    AudioHardwareStub.cpp \