diff options
| author | Jassi Brar <jaswinder.singh@linaro.org> | 2018-07-29 12:54:09 +0530 |
|---|---|---|
| committer | Jerome Forissier <jerome.forissier@linaro.org> | 2018-09-04 17:11:47 +0200 |
| commit | c86451073201c11186b5b6fcaab93eff24ec26a3 (patch) | |
| tree | f1ce02f66fc49ed4cbffda777112bab9d6316500 /mk | |
| parent | b8ea85614b8328ec3e6b464e348d76b843409e9d (diff) | |
aosp_optee.mk: Fix compilation for build outside of source
Trying to specify Android build location outside of souce directory's
default 'out' using OUT_DIR_COMMON_BASE env variable, results in errors
like
"...
<built-in>:1:10: fatal error: 'conf.h' file not found
"
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org> (hikey620)
Acked-by: Victor Chong <victor.chong@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
[jf: wrap commit text]
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/aosp_optee.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/aosp_optee.mk b/mk/aosp_optee.mk index 8378dcc0..52b4f33a 100644 --- a/mk/aosp_optee.mk +++ b/mk/aosp_optee.mk @@ -19,7 +19,7 @@ ########################################################## ## define common variables, like TA_DEV_KIT_DIR ## ########################################################## -OPTEE_OUT_DIR ?= $(PRODUCT_OUT)/optee +OPTEE_OUT_DIR ?= $(realpath $(PRODUCT_OUT))/optee OPTEE_TA_OUT_DIR ?= $(OPTEE_OUT_DIR)/ta # Set so that OP-TEE clients can find the installed dev-kit, which # depends on platform and its OP-TEE word-size. @@ -54,7 +54,7 @@ BUILD_OPTEE_OS_DEFINED := true BUILD_OPTEE_OS: @echo "Start building optee_os..." $(MAKE) -C $(TOP_ROOT_ABS)/$(OPTEE_OS_DIR) \ - O=$(TOP_ROOT_ABS)/$(OPTEE_OS_OUT_DIR) \ + O=$(OPTEE_OS_OUT_DIR) \ ta-targets=$(OPTEE_TA_TARGETS) \ CFG_ARM64_core=$(OPTEE_CFG_ARM64_CORE) \ PLATFORM=$(OPTEE_PLATFORM) \ @@ -96,8 +96,8 @@ $(TA_TMP_FILE): PRIVATE_TA_TMP_FILE := $(TA_TMP_FILE) $(TA_TMP_FILE): PRIVATE_TA_TMP_DIR := $(TA_TMP_DIR) $(TA_TMP_FILE): BUILD_OPTEE_OS @echo "Start building TA for $(PRIVATE_TA_SRC_DIR) $(PRIVATE_TA_TMP_FILE)..." - $(MAKE) -C $(TOP_ROOT_ABS)/$(PRIVATE_TA_SRC_DIR) O=$(TOP_ROOT_ABS)/$(OPTEE_TA_OUT_DIR)/$(PRIVATE_TA_TMP_DIR) \ - TA_DEV_KIT_DIR=$(TOP_ROOT_ABS)/$(TA_DEV_KIT_DIR) \ + $(MAKE) -C $(TOP_ROOT_ABS)/$(PRIVATE_TA_SRC_DIR) O=$(OPTEE_TA_OUT_DIR)/$(PRIVATE_TA_TMP_DIR) \ + TA_DEV_KIT_DIR=$(TA_DEV_KIT_DIR) \ $(CROSS_COMPILE_LINE) @echo "Finished building TA for $(PRIVATE_TA_SRC_DIR) $(PRIVATE_TA_TMP_FILE)..." |