Revert "Audio V4: Split system and vendor Audio.h"
This reverts commit c246f5eaa1dabda72eb3bcf3823d4cab65bd4e83.
Reason for revert: Breaks the build of multiple devices
Change-Id: I516d7467369f9a9b9872e7378c8b2eabc8b1d96e
diff --git a/hal/Android.mk b/hal/Android.mk
index a8b63dd..71d4c80 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -103,6 +103,7 @@
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 \
@@ -174,11 +175,7 @@
LOCAL_SRC_FILES += audio_perf.cpp
-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_HEADER_LIBRARIES += libhardware_headers
LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)
diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 3bd47db..c31b769 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 4773bf8..7d7cfe9 100644
--- a/visualizer/Android.mk
+++ b/visualizer/Android.mk
@@ -40,9 +40,7 @@
-Werror \
-Wno-unused-variable \
-LOCAL_HEADER_LIBRARIES := \
- libhardware_headers \
- android.hardware.audio.effect.legacy@2.0
+LOCAL_HEADER_LIBRARIES := libhardware_headers
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE:= libqcomvisualizer
@@ -51,6 +49,7 @@
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 17ea957..02adf18 100644
--- a/voice_processing/Android.mk
+++ b/voice_processing/Android.mk
@@ -18,6 +18,9 @@
-Wno-unused-function \
-Wno-unused-variable \
+LOCAL_C_INCLUDES += \
+ $(call include-path-for, audio-effects)
+
LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils
@@ -26,8 +29,5 @@
LOCAL_CFLAGS += -fvisibility=hidden
-LOCAL_HEADER_LIBRARIES += \
- libhardware_headers \
- android.hardware.audio.effect.legacy@2.0 \
-
+LOCAL_HEADER_LIBRARIES += libhardware_headers
include $(BUILD_SHARED_LIBRARY)