mk: make the dev kit configuration available while Android.mk is parsed - #13
Merged
lorc merged 2 commits intoAug 6, 2026
Conversation
andrew2311
force-pushed
the
rcar-gen5_4.4.0-xt-android
branch
from
August 3, 2026 12:35
70825ed to
9dd3591
Compare
andrew2311
marked this pull request as draft
August 3, 2026 15:47
andrew2311
force-pushed
the
rcar-gen5_4.4.0-xt-android
branch
from
August 6, 2026 12:51
9dd3591 to
e8fa4ba
Compare
andrew2311
marked this pull request as ready for review
August 6, 2026 12:53
added 2 commits
August 6, 2026 14:58
Add ta_dev_kit_conf, which exports conf.h, conf.mk and conf.cmake. They are written by plain shell commands, so this target compiles nothing and completes in about a second, unlike ta_dev_kit, which builds the libraries too. It is meant for dev kit consumers that need the configuration before they can build anything: optee_test picks its sources from the CFG_* flags it reads from the dev kit conf.mk, and some build systems have to know their sources before any rule can run. Signed-off-by: Andrii Shtompel <andrii_shtompel@epam.com> Reviewed-by: Jerome Forissier <jerome.forissier@arm.com> Acked-by: Tadd Kao <tadd.kao@mediatek.com> (cherry picked from commit 6f806bb)
Run ta_dev_kit_conf while the makefiles are parsed, so that the configuration is on disk before any Android.mk is read; building the dev kit itself is left to the graph as before. The MD5 of the generated conf.mk is kept in a variable so that ckati parses again when the configuration changes, even though it comes from files ckati never reads itself. All optee_os invocations now share one command line, so the configuration read while parsing cannot drift from the one the dev kit is built with. This is for the Android.mk files which select what to build from the CFG_ flags of the dev kit, as optee_test does for its GP socket tests. They read them with -include $(TA_DEV_KIT_DIR)/host_include/conf.mk, which finds nothing on a clean build: ckati parses the makefiles to emit the ninja graph, and the dev kit is built by that very graph. The flags then come out empty and the sources they select are dropped with no diagnostic, so what ends up in the binary depends on whether the output directory is warm. No build dependency can fix this, as the parsing is what produces the rules. Signed-off-by: Andrii Shtompel <andrii_shtompel@epam.com> Reviewed-by: Jerome Forissier <jerome.forissier@arm.com> Acked-by: Tadd Kao <tadd.kao@mediatek.com> (cherry picked from commit a2646d3)
andrew2311
force-pushed
the
rcar-gen5_4.4.0-xt-android
branch
from
August 6, 2026 13:01
e8fa4ba to
8ae1a55
Compare
lorc
merged commit Aug 6, 2026
591fa9e
into
xen-troops:renesas/rcar-gen5_4.4.0-android-xt
1 of 9 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix xtest link error in android (by exposing optee_os dev kit conf.mk)
Backport my 2 commits from optee_os master
Original PR OP-TEE#7897