Piteball
/
android_hardware_qcom_display
mirror of https://github.com/followmsi/android_hardware_qcom_display.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

display: Drop LOCAL_COPY_HEADERS usage 

LOCAL_COPY_HEADERS is deprecated, so remove all its usages
to avoid build warnings.

Change-Id: I964a11f036e03fb9fa2dec05a1698c118b06b421
Signed-off-by: Jabiyeff <cebiyevanar@gmail.com>
This commit is contained in:
Pig 2020-09-19 09:19:29 +08:00 committed by Jabiyeff
parent 124bbbf92d
commit 5057357273
No known key found for this signature in database
GPG Key ID: FE4D239A1DF71CF4
9 changed files with 0 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common.mk
View File

@ -68,29 +68,6 @@ ifeq ($(TARGET_USES_GRALLOC1), true)
common_flags += -DUSE_GRALLOC1
endif
common_includes := system/core/base/include
CHECK_VERSION_LE = $(shell if [ $(1) -le $(2) ] ; then echo true ; else echo false ; fi)
PLATFORM_SDK_NOUGAT = 25
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"
ifeq ($(call CHECK_VERSION_LE, $(PLATFORM_SDK_VERSION), $(PLATFORM_SDK_NOUGAT)), true)
version_flag := -D__NOUGAT__
# These include paths are deprecated post N
common_includes += $(display_top)/libqdutils
common_includes += $(display_top)/libqservice
common_includes += $(display_top)/gpu_tonemapper
ifneq ($(TARGET_IS_HEADLESS), true)
common_includes += $(display_top)/libcopybit
endif
common_includes += $(display_top)/include
common_includes += $(display_top)/sdm/include
common_flags += -isystem $(TARGET_OUT_HEADERS)/qcom/display
endif
endif
common_header_export_path := qcom/display
#Common libraries external to display HAL
common_libs := liblog libutils libcutils libhardware
common_deps :=

7
gpu_tonemapper/Android.mk
View File

@ -1,18 +1,11 @@
LOCAL_PATH := $(call my-dir)
include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)
LOCAL_VENDOR_MODULE := true
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := TonemapFactory.h Tonemapper.h
include $(BUILD_COPY_HEADERS)
include $(CLEAR_VARS)
LOCAL_MODULE := libgpu_tonemapper
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_HEADER_LIBRARIES := display_headers
LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/qcom/display/
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_SHARED_LIBRARIES := libEGL libGLESv2 libGLESv3 libui libutils liblog
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)

2
gralloc/Android.mk
View File

@ -35,8 +35,6 @@ LOCAL_SRC_FILES := gr_ion_alloc.cpp \
gr_allocator.cpp \
gr_buf_mgr.cpp \
gr_device_impl.cpp
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := gr_device_impl.h
ifeq ($(call is-board-platform-in-list, msm8909), true)
LOCAL_CFLAGS += -DUSE_SECURE_HEAP

15
include/Android.mk
View File

@ -1,18 +1,3 @@
LOCAL_PATH:= $(call my-dir)
include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)
# Legacy header copy. This is deprecated.
# Modules using these headers should shift to using
# LOCAL_HEADER_LIBRARIES := display_headers
LOCAL_VENDOR_MODULE := true
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := display_properties.h \
../libqdutils/qd_utils.h \
../libqdutils/display_config.h \
../libqservice/QServiceUtils.h \
../libqservice/IQService.h \
../libqservice/IQHDMIClient.h \
../libqservice/IQClient.h
include $(BUILD_COPY_HEADERS)

6
libcopybit/Android.mk
View File

@ -16,12 +16,6 @@ LOCAL_PATH:= $(call my-dir)
include $(LOCAL_PATH)/../common.mk
include $(CLEAR_VARS)
LOCAL_VENDOR_MODULE := true
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)
LOCAL_COPY_HEADERS := copybit.h copybit_priv.h c2d2.h
#Copy the headers regardless of whether copybit is built
include $(BUILD_COPY_HEADERS)
include $(CLEAR_VARS)
ifneq ($(TARGET_USES_GRALLOC1), true)
LOCAL_MODULE := copybit.$(TARGET_BOARD_PLATFORM)

2
libdrmutils/Android.mk
View File

@ -11,7 +11,5 @@ LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -Werror -fno-opera
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_SRC_FILES := drm_master.cpp drm_res_mgr.cpp drm_lib_loader.cpp
LOCAL_COPY_HEADERS_TO := qcom/display
LOCAL_COPY_HEADERS := drm_master.h drm_res_mgr.h drm_lib_loader.h drm_logger.h drm_interface.h
include $(BUILD_SHARED_LIBRARY)

3
libgralloc/Android.mk
View File

@ -30,8 +30,6 @@ endif
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdgralloc\" -Wno-sign-conversion
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
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 gr.h adreno_utils.h
include $(BUILD_SHARED_LIBRARY)
@ -47,6 +45,5 @@ LOCAL_SHARED_LIBRARIES := $(common_libs) libqdutils libdl
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"qdmemalloc\" -Wno-sign-conversion
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps) $(kernel_deps)
LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp
LOCAL_COPY_HEADERS := alloc_controller.h memalloc.h
include $(BUILD_SHARED_LIBRARY)

28
sdm/libs/core/Android.mk
View File

@ -54,31 +54,3 @@ ifneq ($(TARGET_IS_HEADLESS), true)
endif
include $(BUILD_SHARED_LIBRARY)
SDM_HEADER_PATH := ../../include
include $(CLEAR_VARS)
LOCAL_VENDOR_MODULE := true
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)/sdm/core
LOCAL_COPY_HEADERS = $(SDM_HEADER_PATH)/core/buffer_allocator.h \
$(SDM_HEADER_PATH)/core/buffer_sync_handler.h \
$(SDM_HEADER_PATH)/core/core_interface.h \
$(SDM_HEADER_PATH)/core/debug_interface.h \
$(SDM_HEADER_PATH)/core/display_interface.h \
$(SDM_HEADER_PATH)/core/layer_buffer.h \
$(SDM_HEADER_PATH)/core/layer_stack.h \
$(SDM_HEADER_PATH)/core/sdm_types.h \
$(SDM_HEADER_PATH)/core/socket_handler.h
include $(BUILD_COPY_HEADERS)
include $(CLEAR_VARS)
LOCAL_VENDOR_MODULE := true
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)/sdm/private
LOCAL_COPY_HEADERS = $(SDM_HEADER_PATH)/private/color_interface.h \
$(SDM_HEADER_PATH)/private/color_params.h \
$(SDM_HEADER_PATH)/private/extension_interface.h \
$(SDM_HEADER_PATH)/private/hw_info_types.h \
$(SDM_HEADER_PATH)/private/partial_update_interface.h \
$(SDM_HEADER_PATH)/private/resource_interface.h \
$(SDM_HEADER_PATH)/private/strategy_interface.h \
$(SDM_HEADER_PATH)/private/dpps_control_interface.h
include $(BUILD_COPY_HEADERS)

16
sdm/libs/utils/Android.mk
View File

@ -15,19 +15,3 @@ LOCAL_SRC_FILES := debug.cpp \
utils.cpp
include $(BUILD_SHARED_LIBRARY)
SDM_HEADER_PATH := ../../include
include $(CLEAR_VARS)
LOCAL_VENDOR_MODULE := true
LOCAL_COPY_HEADERS_TO := $(common_header_export_path)/sdm/utils
LOCAL_COPY_HEADERS = $(SDM_HEADER_PATH)/utils/constants.h \
$(SDM_HEADER_PATH)/utils/debug.h \
$(SDM_HEADER_PATH)/utils/formats.h \
$(SDM_HEADER_PATH)/utils/locker.h \
$(SDM_HEADER_PATH)/utils/rect.h \
$(SDM_HEADER_PATH)/utils/sys.h \
$(SDM_HEADER_PATH)/utils/sync_task.h \
$(SDM_HEADER_PATH)/utils/utils.h \
$(SDM_HEADER_PATH)/utils/factory.h
include $(BUILD_COPY_HEADERS)