audio: Drop LOCAL_COPY_HEADERS usage
LOCAL_COPY_HEADERS is deprecated, so remove all its usages
to avoid build warnings.
Change-Id: I4c52508e9109c5f448653fd5613a8991d28bbb2e
diff --git a/qahw_api/Android.mk b/qahw_api/Android.mk
index 1cad75d..e1538ef 100644
--- a/qahw_api/Android.mk
+++ b/qahw_api/Android.mk
@@ -4,12 +4,9 @@
include $(CLEAR_VARS)
-libqahwapi-inc := $(LOCAL_PATH)/inc
-
LOCAL_MODULE := libqahw
LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(libqahwapi-inc)
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/qahw/inc
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
LOCAL_SRC_FILES := \
src/qahw_api.cpp
@@ -20,6 +17,9 @@
LOCAL_STATIC_LIBRARIES += libprofile_rt
endif
+LOCAL_HEADER_LIBRARIES := \
+ libqahw_headers
+
LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \
@@ -29,21 +29,19 @@
LOCAL_CFLAGS += -Wall -Werror
-LOCAL_COPY_HEADERS_TO := mm-audio/qahw_api/inc
-LOCAL_COPY_HEADERS := inc/qahw_api.h
-LOCAL_COPY_HEADERS += inc/qahw_effect_audiosphere.h
-LOCAL_COPY_HEADERS += inc/qahw_effect_bassboost.h
-LOCAL_COPY_HEADERS += inc/qahw_effect_environmentalreverb.h
-LOCAL_COPY_HEADERS += inc/qahw_effect_equalizer.h
-LOCAL_COPY_HEADERS += inc/qahw_effect_presetreverb.h
-LOCAL_COPY_HEADERS += inc/qahw_effect_virtualizer.h
-LOCAL_COPY_HEADERS += inc/qahw_effect_visualizer.h
-
LOCAL_PRELINK_MODULE := false
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libqahwapi_headers
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
+LOCAL_PROPRIETARY_MODULE := true
+
+include $(BUILD_HEADER_LIBRARY)
+
#test app compilation
include $(LOCAL_PATH)/test/Android.mk