Revert "policy_hal: Initial change for the new libaudiopolicymanager"
This reverts commit 0670f1668c90399c3e00d6682b56d3e10c2c0074
Change-Id: Ie03ef15f7f6d6e1cf88c4b39b0d9a0362c17a731
diff --git a/policy_hal/Android.mk b/policy_hal/Android.mk
index b6c01a4..7d365d6 100644
--- a/policy_hal/Android.mk
+++ b/policy_hal/Android.mk
@@ -1,26 +1,49 @@
-ifneq ($(USE_LEGACY_AUDIO_POLICY), 1)
-ifeq ($(USE_CUSTOM_AUDIO_POLICY), 1)
+ifeq ($(strip $(BOARD_USES_EXTN_AUDIO_POLICY_MANAGER)),true)
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= \
- AudioPolicyManager.cpp
+LOCAL_SRC_FILES := AudioPolicyManager.cpp
LOCAL_SHARED_LIBRARIES := \
libcutils \
libutils \
liblog
-LOCAL_C_INCLUDES := \
- $(TOPDIR)frameworks/av/services/audiopolicy \
-
LOCAL_STATIC_LIBRARIES := \
libmedia_helper
-LOCAL_MODULE:= libaudiopolicymanager
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libaudiopolicy_legacy
+
+LOCAL_MODULE := audio_policy.$(TARGET_BOARD_PLATFORM)
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_MODULE_TAGS := optional
+
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM)),true)
+LOCAL_CFLAGS += -DAUDIO_EXTN_FM_ENABLED
+endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true)
+LOCAL_CFLAGS += -DAUDIO_EXTN_AFE_PROXY_ENABLED
+endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INCALL_MUSIC)),true)
+LOCAL_CFLAGS += -DAUDIO_EXTN_INCALL_MUSIC_ENABLED
+endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_HDMI_SPK)),true)
+LOCAL_CFLAGS += -DAUDIO_EXTN_HDMI_SPK_ENABLED
+endif
+
+
+ifeq ($(strip $(TARGET_BOARD_PLATFORM)),msm8916)
+LOCAL_CFLAGS += -DVOICE_CONCURRENCY
+LOCAL_CFLAGS += -DWFD_CONCURRENCY
+endif
+
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_MULTIPLE_TUNNEL)), true)
+LOCAL_CFLAGS += -DMULTIPLE_OFFLOAD_ENABLED
+endif
+
include $(BUILD_SHARED_LIBRARY)
endif
-endif