Merge "display-drivers: Fix for hermetic builds"

Android.mk

@@ -1,12 +1,3 @@
 # Android makefile for display kernel modules
-MY_LOCAL_PATH := $(call my-dir)
-
-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
+LOCAL_PATH := $(call my-dir)
+include $(LOCAL_PATH)/msm/Android.mk

include/uapi/display/Android.mk

@@ -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)

msm/Android.mk

@@ -7,7 +7,7 @@ include $(CLEAR_VARS)
 ifneq ($(findstring vendor,$(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
 
 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
 KBUILD_OPTIONS := DISPLAY_ROOT=$(DISPLAY_BLD_DIR)
-
 KBUILD_OPTIONS += MODNAME=msm_drm
 KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
 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)