From 9db797c1ddddc0a84806786b1ec806626853248c Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Sun, 21 Oct 2018 00:28:47 +0200 Subject: [PATCH] display: Use generated kernel headers Change-Id: Ia1e22dc714f055c966c9ca297523ed33a8c92c8e --- common.mk | 13 ------------- libcopybit/Android.mk | 4 ++-- libexternal/Android.mk | 4 ++-- libgenlock/Android.mk | 2 +- libgralloc/Android.mk | 8 ++++---- libhwcomposer/Android.mk | 4 ++-- liboverlay/Android.mk | 4 ++-- libqdutils/Android.mk | 6 +++--- libqservice/Android.mk | 4 ++-- libvirtual/Android.mk | 4 ++-- 10 files changed, 20 insertions(+), 33 deletions(-) diff --git a/common.mk b/common.mk index a791f541..52793a8c 100644 --- a/common.mk +++ b/common.mk @@ -7,7 +7,6 @@ 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_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include common_header_export_path := qcom/display @@ -35,23 +34,11 @@ ifeq ($(DISPLAY_DEBUG_SWAPINTERVAL),true) common_flags += -DDEBUG_SWAPINTERVAL endif -common_deps := -kernel_includes := - # Executed only on QCOM BSPs ifeq ($(TARGET_USES_QCOM_BSP),true) # This flag is used to compile out any features that depend on framework changes common_flags += -DQCOM_BSP endif -ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM))) -# This check is to pick the kernel headers from the right location. -# If the macro above is defined, we make the assumption that we have the kernel -# available in the build tree. -# If the macro is not present, the headers are picked from hardware/qcom/msmXXXX -# failing which, they are picked from bionic. - common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr - kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include -endif ifeq ($(TARGET_DISPLAY_USE_RETIRE_FENCE),true) common_flags += -DUSE_RETIRE_FENCE diff --git a/libcopybit/Android.mk b/libcopybit/Android.mk index 517ace6e..8dbf92ed 100644 --- a/libcopybit/Android.mk +++ b/libcopybit/Android.mk @@ -25,10 +25,10 @@ LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libdl libmemalloc LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdcopybit\" -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_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 d04af947..11bdfc1d 100644 --- a/libexternal/Android.mk +++ b/libexternal/Android.mk @@ -5,10 +5,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := libexternal LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdexternal\" -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := external.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk index b65f03da..bb17e4a9 100644 --- a/libgenlock/Android.mk +++ b/libgenlock/Android.mk @@ -8,7 +8,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgenlock\" -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := genlock.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk index 8fb30d14..f928a2ed 100644 --- a/libgralloc/Android.mk +++ b/libgralloc/Android.mk @@ -21,11 +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) $(kernel_includes) +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_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_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 @@ -37,10 +37,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmemalloc LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/libhwcomposer/Android.mk b/libhwcomposer/Android.mk index bd46b1f3..8396046d 100644 --- a/libhwcomposer/Android.mk +++ b/libhwcomposer/Android.mk @@ -6,7 +6,7 @@ LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) \ +LOCAL_C_INCLUDES := $(common_includes) \ $(TOP)/external/skia/include/core \ $(TOP)/external/skia/include/images LOCAL_SHARED_LIBRARIES := $(common_libs) libEGL liboverlay \ @@ -17,7 +17,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_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := hwc.cpp \ hwc_utils.cpp \ hwc_uevents.cpp \ diff --git a/liboverlay/Android.mk b/liboverlay/Android.mk index 6c6ab854..6061d49d 100644 --- a/liboverlay/Android.mk +++ b/liboverlay/Android.mk @@ -5,10 +5,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := liboverlay LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libmemalloc libsync LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdoverlay\" -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := \ overlay.cpp \ overlayUtils.cpp \ diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk index 76ea0cda..e5bae0a8 100644 --- a/libqdutils/Android.mk +++ b/libqdutils/Android.mk @@ -5,9 +5,9 @@ include $(CLEAR_VARS) LOCAL_MODULE := libqdutils LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder libqservice libui -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_C_INCLUDES := $(common_includes) LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdutils\" -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_COPY_HEADERS_TO := $(common_header_export_path) LOCAL_COPY_HEADERS := display_config.h mdp_version.h LOCAL_SRC_FILES := profiler.cpp mdp_version.cpp \ @@ -23,7 +23,7 @@ LOCAL_COPY_HEADERS := qdMetaData.h LOCAL_VENDOR_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libcutils LOCAL_C_INCLUDES := $(common_includes) -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := qdMetaData.cpp LOCAL_CFLAGS := $(common_flags) LOCAL_CFLAGS += -DLOG_TAG=\"DisplayMetaData\" diff --git a/libqservice/Android.mk b/libqservice/Android.mk index 7f19770d..2c3971b1 100644 --- a/libqservice/Android.mk +++ b/libqservice/Android.mk @@ -5,11 +5,11 @@ include $(CLEAR_VARS) LOCAL_MODULE := libqservice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) libbinder LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdqservice\" LOCAL_CFLAGS += -Wno-error -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := QService.cpp \ IQService.cpp \ IQClient.cpp diff --git a/libvirtual/Android.mk b/libvirtual/Android.mk index a771237a..b182ba81 100644 --- a/libvirtual/Android.mk +++ b/libvirtual/Android.mk @@ -5,10 +5,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := libvirtual LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional -LOCAL_C_INCLUDES := $(common_includes) $(kernel_includes) +LOCAL_C_INCLUDES := $(common_includes) LOCAL_SHARED_LIBRARIES := $(common_libs) liboverlay libqdutils LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdvirtual\" -LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) +LOCAL_HEADER_LIBRARIES := generated_kernel_headers LOCAL_SRC_FILES := virtual.cpp LOCAL_STATIC_LIBRARIES := libbase