Merge "Audio V4: Split system and vendor Audio.h"
diff --git a/hal/Android.mk b/hal/Android.mk
index 02c4832..feb70c7 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -106,7 +106,6 @@
external/tinyalsa/include \
external/tinycompress/include \
$(call include-path-for, audio-route) \
- $(call include-path-for, audio-effects) \
$(LOCAL_PATH)/$(AUDIO_PLATFORM) \
$(LOCAL_PATH)/audio_extn \
$(LOCAL_PATH)/voice_extn \
@@ -178,7 +177,11 @@
LOCAL_SRC_FILES += audio_perf.cpp
-LOCAL_HEADER_LIBRARIES += libhardware_headers
+LOCAL_HEADER_LIBRARIES += \
+ libhardware_headers \
+ android.hardware.audio.common.legacy@2.0 \
+ android.hardware.audio.effect.legacy@2.0 \
+ android.hardware.soundtrigger.legacy@2.0 \
LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index c31b769..3bd47db 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -34,10 +34,10 @@
LOCAL_C_INCLUDES := \
external/tinyalsa/include \
- $(call include-path-for, audio-effects)
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
+LOCAL_HEADER_LIBRARIES += android.hardware.audio.effect.legacy@2.0
include $(BUILD_SHARED_LIBRARY)
endif
@@ -66,10 +66,10 @@
LOCAL_C_INCLUDES := \
hardware/qcom/audio/hal \
- $(call include-path-for, audio-effects)
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_HEADER_LIBRARIES += libsystem_headers
+LOCAL_HEADER_LIBRARIES += android.hardware.audio.effect.legacy@2.0
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/visualizer/Android.mk b/visualizer/Android.mk
index 7d7cfe9..4773bf8 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -40,7 +40,9 @@
-Werror \
-Wno-unused-variable \
-LOCAL_HEADER_LIBRARIES := libhardware_headers
+LOCAL_HEADER_LIBRARIES := \
+ libhardware_headers \
+ android.hardware.audio.effect.legacy@2.0
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE:= libqcomvisualizer
@@ -49,7 +51,6 @@
LOCAL_C_INCLUDES := \
external/tinyalsa/include \
- $(call include-path-for, audio-effects)
LOCAL_HEADER_LIBRARIES += libsystem_headers
include $(BUILD_SHARED_LIBRARY)
diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
index 02adf18..17ea957 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -18,9 +18,6 @@
-Wno-unused-function \
-Wno-unused-variable \
-LOCAL_C_INCLUDES += \
- $(call include-path-for, audio-effects)
-
LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils
@@ -29,5 +26,8 @@
LOCAL_CFLAGS += -fvisibility=hidden
-LOCAL_HEADER_LIBRARIES += libhardware_headers
+LOCAL_HEADER_LIBRARIES += \
+ libhardware_headers \
+ android.hardware.audio.effect.legacy@2.0 \
+
include $(BUILD_SHARED_LIBRARY)