Merge "libhardware_legacy: remove dead code in Android.mk" am: 955b796f36 am: fa192e08eb

am: 20107d1fc9

Change-Id: I4344edee0d02c8df684147bde83ab67bf95c9a99

diff --cc audio/Android.mk
index 894cdf8,a64c6b8..8f8284f
--- 1/audio/Android.mk
--- 2/audio/Android.mk
+++ b/audio/Android.mk
@@@ -19,26 -19,49 +19,4 @@@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_
  
  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_SHARED_LIBRARIES := libmedia
 -LOCAL_STATIC_LIBRARIES := libmedia_helper
 -LOCAL_MODULE := libaudiopolicy_legacy
 -LOCAL_CFLAGS += -Wno-unused-parameter
 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
 -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 -
 -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 \
 -    libmedia \
 -    libutils \
 -    liblog
 -
 -LOCAL_STATIC_LIBRARIES := \
 -    libmedia_helper
 -
 -LOCAL_WHOLE_STATIC_LIBRARIES := \
 -    libaudiopolicy_legacy
 -
 -LOCAL_MODULE := audio_policy.default
 -LOCAL_MODULE_RELATIVE_PATH := hw
 -LOCAL_CFLAGS := -Wno-unused-parameter
 -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
 -
 -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 \