samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display-drivers: Fix for hermetic builds

Browse Source 
* Remove shell usage.
* Remove legacy makefile for UAPI headers.

Change-Id: Ia037e19899d6f1c2a6107e174148ce15c8d4a7e1
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
This commit is contained in:
Naseer Ahmed
2021-05-04 11:54:14 -07:00
committed by Gerrit - the friendly Code Review server
parent c6c2521f6e
commit c98a0bf251
3 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Android.mk
View File

@@ -1,12 +1,3 @@
# Android makefile for display kernel modules # Android makefile for display kernel modules
MY_LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(LOCAL_PATH)/msm/Android.mk
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*)
UAPI_OUT := $(PRODUCT_OUT)/obj/vendor/qcom/opensource/display-drivers/include
$(shell mkdir -p $(UAPI_OUT)/display;)
include $(MY_LOCAL_PATH)/include/uapi/display/Android.mk
include $(MY_LOCAL_PATH)/msm/Android.mk

25
include/uapi/display/Android.mk
View File

@@ -1,25 +0,0 @@
LOCAL_PATH := $(call my-dir)
MYLOCAL_PATH := $(LOCAL_PATH)
UAPI_OUT := $(PRODUCT_OUT)/obj/vendor/qcom/opensource/display-drivers/include/display
DISPLAY_DRIVER_HEADERS := $(call all-named-files-under,*.h,drm) $(call all-named-files-under,*.h,media)
HEADER_INSTALL_DIR := kernel/msm-$(TARGET_KERNEL_VERSION)/scripts
BUILD_ROOT_RELATIVE := ../../../../../../
include $(CLEAR_VARS)
LOCAL_MODULE := display_driver_headers
GEN := $(addprefix $(UAPI_OUT)/,$(DISPLAY_DRIVER_HEADERS))
$(GEN): $(KERNEL_USR)
$(GEN): PRIVATE_PATH := $(MYLOCAL_PATH)
$(GEN): PRIVATE_CUSTOM_TOOL = $(shell cd $(PRODUCT_OUT)/obj/KERNEL_OBJ; $(BUILD_ROOT_RELATIVE)$(HEADER_INSTALL_DIR)/headers_install.sh $(BUILD_ROOT_RELATIVE)$(dir $@) $(BUILD_ROOT_RELATIVE)$(subst $(UAPI_OUT),$(MYLOCAL_PATH),$(dir $@)) $(notdir $@))
$(GEN): $(addprefix $(MYLOCAL_PATH)/,$(DISPLAY_DRIVER_HEADERS))
$(transform-generated-source)
LOCAL_GENERATED_SOURCES := $(GEN)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(UAPI_OUT)
include $(BUILD_HEADER_LIBRARY)

5
msm/Android.mk
View File

@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),)
DISPLAY_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/display-drivers DISPLAY_BLD_DIR := $(TOP)/vendor/qcom/opensource/display-drivers
endif # opensource endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm
@@ -18,12 +18,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOC
########################################################### ###########################################################
# This is set once per LOCAL_PATH, not per (kernel) module # This is set once per LOCAL_PATH, not per (kernel) module
KBUILD_OPTIONS := DISPLAY_ROOT=$(DISPLAY_BLD_DIR) KBUILD_OPTIONS := DISPLAY_ROOT=$(DISPLAY_BLD_DIR)
KBUILD_OPTIONS += MODNAME=msm_drm KBUILD_OPTIONS += MODNAME=msm_drm
KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
KBUILD_OPTIONS += $(DISPLAY_SELECT) KBUILD_OPTIONS += $(DISPLAY_SELECT)
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(shell pwd)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(PWD)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
########################################################### ###########################################################
include $(CLEAR_VARS) include $(CLEAR_VARS)