diff options
Diffstat (limited to 'libaudio/Android.mk')
| -rw-r--r-- | libaudio/Android.mk | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/libaudio/Android.mk b/libaudio/Android.mk index 726859b..9dbe57d 100644 --- a/libaudio/Android.mk +++ b/libaudio/Android.mk @@ -1,7 +1,5 @@ LOCAL_PATH:= $(call my-dir) -ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),) - include $(CLEAR_VARS) LOCAL_SRC_FILES:= aplay.c alsa_pcm.c alsa_mixer.c LOCAL_MODULE:= aplay @@ -25,12 +23,12 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES:= AudioHardware.cpp alsa_mixer.c alsa_pcm.c -LOCAL_MODULE:= libaudio -LOCAL_STATIC_LIBRARIES:= libaudiointerface -LOCAL_SHARED_LIBRARIES:= libc libcutils libutils libmedia libhardware_legacy -ifeq ($(BOARD_HAVE_BLUETOOTH),true) - LOCAL_SHARED_LIBRARIES += liba2dp -endif +LOCAL_MODULE := audio.primary.herring +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_STATIC_LIBRARIES:= libmedia_helper +LOCAL_SHARED_LIBRARIES:= libcutils libutils libmedia libhardware_legacy +LOCAL_WHOLE_STATIC_LIBRARIES := libaudiohw_legacy +LOCAL_MODULE_TAGS := optional ifeq ($(TARGET_SIMULATOR),true) LOCAL_LDLIBS += -ldl @@ -41,13 +39,17 @@ endif include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES:= AudioPolicyManager.cpp -LOCAL_MODULE:= libaudiopolicy -LOCAL_STATIC_LIBRARIES:= libaudiopolicybase -LOCAL_SHARED_LIBRARIES:= libc libcutils libutils libmedia + +LOCAL_SRC_FILES := AudioPolicyManager.cpp +LOCAL_SHARED_LIBRARIES := libcutils libutils libmedia +LOCAL_STATIC_LIBRARIES := libmedia_helper +LOCAL_WHOLE_STATIC_LIBRARIES := libaudiopolicy_legacy +LOCAL_MODULE := audio_policy.herring +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_TAGS := optional + ifeq ($(BOARD_HAVE_BLUETOOTH),true) LOCAL_CFLAGS += -DWITH_A2DP endif -include $(BUILD_SHARED_LIBRARY) -endif +include $(BUILD_SHARED_LIBRARY) |