media: Switch to display_headers lib include
LOCAL_COPY_HEADERS is deprecated and Qualcomm HALs have been
updated to remove its usage. As a consequence, the display headers
are no longer copied to TARGET_OUT_HEADERS, so use the equivalent
header lib instead.
Change-Id: Ic32a979a608bad3831bc0a2c64942f80c5028b01
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk
index ed4c474..10dae8d 100755
--- a/libc2dcolorconvert/Android.mk
+++ b/libc2dcolorconvert/Android.mk
@@ -7,10 +7,10 @@
LOCAL_C_INCLUDES := \
$(TARGET_OUT_HEADERS)/adreno
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/qcom/display
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_HEADER_LIBRARIES := \
+ display_headers \
libutils_headers \
libhardware_headers
diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk
index af8da77..22a173c 100644
--- a/mm-video-v4l2/vidc/common/Android.mk
+++ b/mm-video-v4l2/vidc/common/Android.mk
@@ -22,7 +22,6 @@
libmm-vidc-inc := $(LOCAL_PATH)/inc
libmm-vidc-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc
-libmm-vidc-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vidc-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert
libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
@@ -40,6 +39,7 @@
LOCAL_HEADER_LIBRARIES := libutils_headers
LOCAL_HEADER_LIBRARIES := \
+ display_headers \
libutils_headers
LOCAL_SRC_FILES += src/vidc_common.cpp
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index de00a43..80198ee 100755
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -58,7 +58,6 @@
libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/mm-video-v4l2/vidc/common/inc
libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc
libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/libplatformconfig
-libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno
libmm-vdec-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/mm-video/SwVdec
@@ -100,6 +99,7 @@
LOCAL_CFLAGS := $(libmm-vdec-def) -Werror
LOCAL_HEADER_LIBRARIES := \
+ display_headers \
media_plugin_headers \
libnativebase_headers \
libutils_headers \
@@ -145,6 +145,7 @@
LOCAL_CFLAGS := $(libmm-vdec-def)
LOCAL_HEADER_LIBRARIES := \
+ display_headers \
media_plugin_headers \
libnativebase_headers \
libutils_headers \
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index f9d0173..76d1d22 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -61,7 +61,6 @@
libmm-venc-inc += $(QCOM_MEDIA_ROOT)/mm-core/inc
libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libstagefrighthw
libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libplatformconfig
-libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno
libmm-venc-inc += $(QCOM_MEDIA_ROOT)/libc2dcolorconvert
libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip
@@ -89,6 +88,7 @@
LOCAL_CFLAGS := $(libmm-venc-def)
LOCAL_HEADER_LIBRARIES := \
+ display_headers \
media_plugin_headers \
libnativebase_headers \
libcutils_headers \
@@ -138,6 +138,7 @@
LOCAL_CFLAGS := $(libmm-venc-def)
LOCAL_HEADER_LIBRARIES := \
+ display_headers \
media_plugin_headers \
libnativebase_headers \
libutils_headers \