From 51325414dbfda98d84365b774d84f750461366b6 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Sun, 15 Nov 2020 01:15:08 +0100 Subject: [PATCH] display: Add display headers lib LOCAL_COPY_HEADERS is deprecated. Replace with headers lib to avoid build warnings. Change-Id: I5512cec25ad8f93cbdf97ab817e608e8628d45ff --- Android.mk | 13 +++++++++++++ common.mk | 12 +----------- libcopybit/Android.mk | 8 +------- libexternal/Android.mk | 3 +-- libgenlock/Android.mk | 3 +-- libgralloc/Android.mk | 8 ++------ libhwcomposer/Android.mk | 5 +---- liboverlay/Android.mk | 3 +-- libqdutils/Android.mk | 11 ++--------- libqservice/Android.mk | 7 +------ libvirtual/Android.mk | 3 +-- 11 files changed, 25 insertions(+), 51 deletions(-) diff --git a/Android.mk b/Android.mk index c64fa65e..ed9ca302 100644 --- a/Android.mk +++ b/Android.mk @@ -16,4 +16,17 @@ ifneq ($(filter msm8226 msm8x26 msm8960 msm8974 msm8x74,$(TARGET_BOARD_PLATFORM) endif endif +include $(CLEAR_VARS) +LOCAL_MODULE := display_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := \ + $(display_top)/libcopybit \ + $(display_top)/libexternal \ + $(display_top)/libgralloc \ + $(display_top)/libhwcomposer \ + $(display_top)/liboverlay \ + $(display_top)/libqdutils \ + $(display_top)/libqservice \ + $(display_top)/libvirtual +include $(BUILD_HEADER_LIBRARY) + endif diff --git a/common.mk b/common.mk index 0f4c925b..0d4c469b 100644 --- a/common.mk +++ b/common.mk @@ -1,14 +1,4 @@ -#Common headers -common_includes := $(call project-path-for,qcom-display)/libgralloc -common_includes += $(call project-path-for,qcom-display)/liboverlay -common_includes += $(call project-path-for,qcom-display)/libcopybit -common_includes += $(call project-path-for,qcom-display)/libqdutils -common_includes += $(call project-path-for,qcom-display)/libhwcomposer -common_includes += $(call project-path-for,qcom-display)/libexternal -common_includes += $(call project-path-for,qcom-display)/libqservice -common_includes += $(call project-path-for,qcom-display)/libvirtual - -common_header_export_path := qcom/display +display_top := $(call my-dir) #Common libraries external to display HAL common_libs := liblog libutils libcutils libhardware diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk index f2686199..a39e666e 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -15,20 +15,14 @@ LOCAL_PATH:= $(call my-dir) include $(LOCAL_PATH)/../common.mk -include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := $(common_header_export_path) -LOCAL_COPY_HEADERS := copybit.h copybit_priv.h c2d2.h -include $(BUILD_COPY_HEADERS) - include $(CLEAR_VARS) LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdcopybit\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers ifeq ($(TARGET_USES_C2D_COMPOSITION),true) LOCAL_CFLAGS += -DCOPYBIT_Z180=1 -DC2D_SUPPORT_DISPLAY=1 diff --git a/libexternal/Android.mk b/libexternal/Android.mk index 11bdfc1d..063f7eca 100644 --- a/libexternal/Android.mk +++ b/libexternal/Android.mk @@ -5,10 +5,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := libexternal LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdexternal\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := external.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk index bb17e4a9..d03bee01 100644 --- a/libgenlock/Android.mk +++ b/libgenlock/Android.mk @@ -5,10 +5,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := libgenlock LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgenlock\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := genlock.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index f928a2ed..03f62eeb 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -21,14 +21,11 @@ LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libmemalloc LOCAL_SHARED_LIBRARIES += libqdutils libGLESv1_CM LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := gpu.cpp gralloc.cpp framebuffer.cpp mapper.cpp -LOCAL_COPY_HEADERS_TO := $(common_header_export_path) -LOCAL_COPY_HEADERS := gralloc_priv.h include $(BUILD_SHARED_LIBRARY) @@ -37,10 +34,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmemalloc LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk index 8396046d..1e39f4d3 100644 --- a/libhwcomposer/Android.mk +++ b/libhwcomposer/Android.mk @@ -6,9 +6,6 @@ LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) \ - $(TOP)/external/skia/include/core \ - $(TOP)/external/skia/include/images LOCAL_SHARED_LIBRARIES := $(common_libs) libEGL liboverlay \ libexternal libqdutils libhardware_legacy \ libdl libmemalloc libqservice libsync \ @@ -17,7 +14,7 @@ LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdhwcomposer\" ifeq ($(GET_DISPLAY_SECURE_STATUS_FROM_HWC),true) LOCAL_CFLAGS += -DGET_DISPLAY_SECURE_STATUS_FROM_HWC endif -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := hwc.cpp \ hwc_utils.cpp \ hwc_uevents.cpp \ diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk index 6061d49d..7b2d599e 100644 --- a/liboverlay/Android.mk +++ b/liboverlay/Android.mk @@ -5,10 +5,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := liboverlay LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libmemalloc libsync LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdoverlay\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := \ overlay.cpp \ overlayUtils.cpp \ diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk index e5bae0a8..ce65c6f9 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -5,11 +5,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libqdutils LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder libqservice libui -LOCAL_C_INCLUDES := $(common_includes) LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers -LOCAL_COPY_HEADERS_TO := $(common_header_export_path) -LOCAL_COPY_HEADERS := display_config.h mdp_version.h +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := profiler.cpp mdp_version.cpp \ idle_invalidator.cpp \ comptype.cpp display_config.cpp \ @@ -18,16 +15,12 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := $(common_header_export_path) -LOCAL_COPY_HEADERS := qdMetaData.h LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libcutils -LOCAL_C_INCLUDES := $(common_includes) -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := qdMetaData.cpp LOCAL_CFLAGS := $(common_flags) LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\" LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libqdMetaData include $(BUILD_SHARED_LIBRARY) - diff --git a/libqservice/Android.mk b/libqservice/Android.mk index 2c3971b1..a5af13f4 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -5,17 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE := libqservice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdqservice\" LOCAL_CFLAGS += -Wno-error -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := QService.cpp \ IQService.cpp \ IQClient.cpp -LOCAL_COPY_HEADERS_TO := $(common_header_export_path) -LOCAL_COPY_HEADERS := IQService.h \ - IQClient.h - include $(BUILD_SHARED_LIBRARY) diff --git a/libvirtual/Android.mk b/libvirtual/Android.mk index 2182d721..d58123f0 100644 --- a/libvirtual/Android.mk +++ b/libvirtual/Android.mk @@ -5,10 +5,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := libvirtual LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils libmedia LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdvirtual\" -LOCAL_HEADER_LIBRARIES := generated_kernel_headers +LOCAL_HEADER_LIBRARIES := generated_kernel_headers display_headers LOCAL_SRC_FILES := virtual.cpp LOCAL_STATIC_LIBRARIES := libbase