diff options
| author | Arne Coucheron <arco68@gmail.com> | 2020-11-15 01:51:38 +0100 |
|---|---|---|
| committer | Julian Veit <Claymore1298@gmail.com> | 2020-11-28 14:02:49 +0100 |
| commit | 0a40493d2afc2e03651afac08dfe365d9a573a78 (patch) | |
| tree | 324d2e7a5250b06a387087cf0e3e0ed897e6e4bd | |
| parent | 73d4e958b57f256c623d7beec51572fb6276138e (diff) | |
media: Include display headerss12.0-caf-8994r11.1-caf-8994r11.0-caf-8994
Change-Id: Ic32a979a608bad3831bc0a2c64942f80c5028b01
| -rw-r--r-- | libc2dcolorconvert/Android.mk | 5 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/common/Android.mk | 3 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/Android.mk | 5 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/Android.mk | 3 |
4 files changed, 5 insertions, 11 deletions
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk index 13e9944a..c7bd5f22 100644 --- a/libc2dcolorconvert/Android.mk +++ b/libc2dcolorconvert/Android.mk @@ -5,12 +5,9 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ C2DColorConverter.cpp -LOCAL_C_INCLUDES := \ - $(TARGET_OUT_HEADERS)/qcom/display - LOCAL_SHARED_LIBRARIES := liblog libdl -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := display_headers generated_kernel_headers LOCAL_MODULE_TAGS := optional diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk index 6f783c42..b332730b 100644 --- a/mm-video-v4l2/vidc/common/Android.mk +++ b/mm-video-v4l2/vidc/common/Android.mk @@ -22,7 +22,6 @@ libmm-vidc-def += -D_ANDROID_ICS_ libmm-vidc-inc := $(LOCAL_PATH)/inc libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/mm-core/inc -libmm-vidc-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/libc2dcolorconvert libmm-vidc-inc += $(TOP)/frameworks/av/include/media/stagefright @@ -32,7 +31,7 @@ LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vidc-def) LOCAL_C_INCLUDES := $(libmm-vidc-inc) -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := display_headers generated_kernel_headers LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libdl diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk index aedca205..ffff9f15 100644 --- a/mm-video-v4l2/vidc/vdec/Android.mk +++ b/mm-video-v4l2/vidc/vdec/Android.mk @@ -58,7 +58,6 @@ include $(CLEAR_VARS) libmm-vdec-inc := $(LOCAL_PATH)/inc libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/inc libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-core/inc -libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno libmm-vdec-inc += $(TOP)/frameworks/native/include/media/openmax libmm-vdec-inc += $(TOP)/frameworks/native/include/media/hardware @@ -100,7 +99,7 @@ LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) -Werror LOCAL_C_INCLUDES += $(libmm-vdec-inc) -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := display_headers generated_kernel_headers LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libui libcutils libdl @@ -138,7 +137,7 @@ LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-vdec-def) LOCAL_C_INCLUDES += $(libmm-vdec-inc) -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := display_headers generated_kernel_headers LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libbinder libcutils libdl diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk index ff43abdc..0b509dc9 100644 --- a/mm-video-v4l2/vidc/venc/Android.mk +++ b/mm-video-v4l2/vidc/venc/Android.mk @@ -58,7 +58,6 @@ libmm-venc-inc := $(LOCAL_PATH)/inc libmm-venc-inc += $(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/inc libmm-venc-inc += $(call project-path-for,qcom-media)/mm-core/inc libmm-venc-inc += $(call project-path-for,qcom-media)/libstagefrighthw -libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno libmm-venc-inc += frameworks/native/include/media/hardware libmm-venc-inc += frameworks/native/include/media/openmax @@ -80,7 +79,7 @@ LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(libmm-venc-def) LOCAL_C_INCLUDES := $(libmm-venc-inc) -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := display_headers generated_kernel_headers LOCAL_PRELINK_MODULE := false LOCAL_SHARED_LIBRARIES := liblog libutils libcutils \ |