From bbead2bf5bbf00863342558ba377a6acc22c9b9f Mon Sep 17 00:00:00 2001 From: Andrii Shtompel Date: Wed, 29 Jul 2026 13:21:19 +0200 Subject: [PATCH] xtest: make the dev kit configuration a required input Turn the -include of the dev kit conf.mk into a hard include, so that a missing configuration fails the build. The CFG_ flags it carries select which tests are built, and -include accepts it missing: the flags come out empty and the tests they select are dropped from xtest with no diagnostic, which is issue #275. optee_os now generates the configuration while the Android makefiles are parsed, so conf.mk is there by the time this file is read. Signed-off-by: Andrii Shtompel Acked-by: Jerome Forissier --- Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index c6ef29f8b..fcf28a829 100644 --- a/Android.mk +++ b/Android.mk @@ -15,7 +15,9 @@ VERSION = $(shell git describe --always --dirty=-dev 2>/dev/null || echo Unknown # We set the default value to an invalid path. TA_DEV_KIT_DIR ?= ../invalid_include_path --include $(TA_DEV_KIT_DIR)/host_include/conf.mk +# optee_os generates this configuration while the Android makefiles are parsed +# so it is always available and must be a hard include. +include $(TA_DEV_KIT_DIR)/host_include/conf.mk include $(LOCAL_PATH)/scripts/common.mk ################################################################################