Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7 am: 41fc794eff

[android-x86/hardware-libhardware_legacy.git] / audio / Android.mk

diff --git a/audio/Android.mk b/audio/Android.mk
index a69b9cd..8f8284f 100644 (file)
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -11,70 +11,12 @@ LOCAL_SRC_FILES := \
     audio_hw_hal.cpp
 
 LOCAL_MODULE := libaudiohw_legacy
-LOCAL_MODULE_TAGS := optional
+LOCAL_SHARED_LIBRARIES := libmedia
 LOCAL_STATIC_LIBRARIES := libmedia_helper
+LOCAL_CFLAGS := -Wno-unused-parameter -Wno-gnu-designator
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 
 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
-
-LOCAL_STATIC_LIBRARIES := libmedia_helper
-LOCAL_MODULE := libaudiopolicy_legacy
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-
-# The default audio policy, for now still implemented on top of legacy
-# policy code
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    AudioPolicyManagerDefault.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libutils
-
-LOCAL_STATIC_LIBRARIES := \
-    libmedia_helper
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-    libaudiopolicy_legacy
-
-LOCAL_MODULE := audio_policy.default
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_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 \
-#endif
-#
-#include $(BUILD_SHARED_LIBRARY)
 
-#    AudioHardwareGeneric.cpp \
-#    AudioHardwareStub.cpp \