| author | Shuide Chen <shuide.chen@amlogic.com> | 2020-02-17 02:48:13 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2020-03-03 04:09:28 (GMT) |
| commit | f8650eda4cd3a5b4343ad3b3ae964b333d59cd62 (patch) | |
| tree | 8818265d60356dc186027e837b67a1446e43d202 | |
| parent | bb77cc3ae660424272715d30a1ad3b7e27642c7d (diff) | |
| download | tdk_linuxdriver-amlogic-4.9-clang.zip tdk_linuxdriver-amlogic-4.9-clang.tar.gz tdk_linuxdriver-amlogic-4.9-clang.tar.bz2 | |
tdk: support clang and gcc build [6/8]
PD#SWPL-20698
Problem:
need support build with clang
Solution:
modify build args to support build with clang and gcc
Verify:
local and patchbuild
Signed-off-by: Shuide Chen <shuide.chen@amlogic.com>
Change-Id: Id5d8fbb2306a0d5cf400a3072ca763a1510b9112
| -rw-r--r-- | Android.mk | 21 |
1 files changed, 5 insertions, 16 deletions
@@ -17,10 +17,9 @@ define build_optee_modules echo "$(1) $(2) $(3)" mkdir -p $(2)/ cp -rfa $(1)/* $(2)/ - PATH=$$(cd ./$(TARGET_HOST_TOOL_PATH); pwd):$$PATH \ + PATH=$(KERNEL_TOOLPATHS):$$PATH \ $(MAKE) -C $(KERNEL_OUT_DIR) M=$(strip $(2)) \ - KERNEL_A32_SUPPORT=$(KERNEL_A32_SUPPORT) ARCH=$(KERNEL_ARCH) \ - CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) + KERNEL_A32_SUPPORT=$(KERNEL_A32_SUPPORT) $(KERNEL_ARGS) endef else define build_optee_modules @@ -28,14 +27,13 @@ define build_optee_modules mkdir -p $(2)/ cp -rfa $(1)/* $(2)/ $(MAKE) -C $(KERNEL_OUT_DIR) M=$(strip $(2)) \ - KERNEL_A32_SUPPORT=$(KERNEL_A32_SUPPORT) ARCH=$(KERNEL_ARCH) \ - CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) + KERNEL_A32_SUPPORT=$(KERNEL_A32_SUPPORT) $(KERNEL_ARGS) endef endif +ifneq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), false) $(PRODUCT_OUT)/obj/optee_modules/optee.ko: $(INSTALLED_KERNEL_TARGET) $(call build_optee_modules, $(OPTEE_DRIVERS), $(OPTEE_MODULES)) - endif @@ -44,16 +42,11 @@ LOCAL_MODULE := optee_armtz LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES -ifneq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), false) GEN_OPTEE_ARMTZ := $(local-generated-sources-dir)/optee_armtz.ko $(GEN_OPTEE_ARMTZ): $(PRODUCT_OUT)/obj/optee_modules/optee.ko | $(ACP) cp $(PRODUCT_OUT)/obj/optee_modules/optee/optee_armtz.ko $(GEN_OPTEE_ARMTZ) LOCAL_PREBUILT_MODULE_FILE := $(GEN_OPTEE_ARMTZ) -else -# TARGET_BOOTLOADER_BOARD_NAME currently defined the same as platform device name -LOCAL_SRC_FILES := device/amlogic/$(TARGET_BOOTLOADER_BOARD_NAME)-kernel/optee_armtz.ko -endif LOCAL_MODULE_SUFFIX := .ko LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib @@ -65,19 +58,15 @@ include $(CLEAR_VARS) LOCAL_MODULE := optee LOCAL_MODULE_CLASS := SHARED_LIBRARIES -ifneq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), false) GEN_OPTEE := $(local-generated-sources-dir)/optee.ko $(GEN_OPTEE): $(PRODUCT_OUT)/obj/optee_modules/optee.ko | $(ACP) cp $(PRODUCT_OUT)/obj/optee_modules/optee.ko $(GEN_OPTEE) LOCAL_PREBUILT_MODULE_FILE := $(GEN_OPTEE) -else -LOCAL_SRC_FILES := \ - device/amlogic/$(TARGET_BOOTLOADER_BOARD_NAME)-kernel/optee.ko -endif LOCAL_MODULE_TAGS := optional LOCAL_MODULE_SUFFIX := .ko LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/lib LOCAL_STRIP_MODULE := false include $(BUILD_PREBUILT) +endif |