audio: Updates to comply with standard libhardware_legacy audio hal
Revert back to original libhardware_legacy audio hal headers from AOSP.
This makes corresponding code changes to disable features to match
audio hal implementation with standard libhardware_legacy audio hal.
Change-Id: Ibf1e50d3fffc8280ba417a26172c0f04206474e3
diff --git a/alsa_sound/Android.mk b/alsa_sound/Android.mk
index cdc2694..38c3a5c 100644
--- a/alsa_sound/Android.mk
+++ b/alsa_sound/Android.mk
@@ -51,7 +51,7 @@
include $(BUILD_SHARED_LIBRARY)
-ifeq (1,1) # use default audio policy manager
+ifeq (1,0) # use default audio policy manager
# This is the ALSA audio policy manager
include $(CLEAR_VARS)
@@ -85,6 +85,15 @@
include $(BUILD_SHARED_LIBRARY)
endif
+# Load audio_policy.conf to system/etc/
+include $(CLEAR_VARS)
+LOCAL_MODULE := audio_policy.conf
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/
+LOCAL_SRC_FILES := audio_policy.conf
+include $(BUILD_PREBUILT)
+
# This is the ALSA module which behaves closely like the original
include $(CLEAR_VARS)