android: convert .mk files to .bp

[massonju]

Android use by default Soong Build System, *.mk files are deprecated in favor of Android.bp [1].

All the logics present in android mk files have been ported to a single Android.bp

optee_client.device.mk set the same default flags as we did in the old Android *.mk files.

Example of configs in device/VENDOR/BOARD/device.mk:

include $(PATH_OPTEE_CLIENT)/optee_client.device.mk
PRODUCT_PACKAGES += \
    libteec \
    tee-supplicant

[1] https://source.android.com/docs/setup/build

[massonju]

FYI it has been tested with TI am62x board on Android 14 (kmgk, tee-supplicant, libteec ...).

https://baylibre.pages.baylibre.com/ti/android/doc/index.html

[jforissier]

Thanks for the contribution. Is it easy enough for someone currently using the .mk files to switch to the new build system? If so I have no objections.

[massonju]

Hi @jforissier,

All the external *.mk files which depends on binary/libraries from optee-client don't need to be updated.

For example keymaster from kmgk is still using .mk format and depends on libteec, it doesn't need to be updated.

However all the flags defined in Android.bp of optee-client project must be set in "soong" way.

On our TI board we modify some of these flags.
Before: (device/ti/am62x/optee/device-optee.mk)

CFG_TEE_FS_PARENT_PATH := /mnt/vendor/persist/tee

PRODUCT_PACKAGES += \
    libteec \
    tee-supplicant

https://gitlab.baylibre.com/baylibre/ti/android/aosp/device/ti/am62x/-/blob/ti-android-14/optee/device-optee.mk?ref_type=heads#L28

After:

include vendor/linaro/optee_client/optee_client.device.mk
$(call soong_config_set,optee_client,cfg_tee_fs_parent_path,/mnt/vendor/persist/tee)

PRODUCT_PACKAGES += \
    libteec \
    tee-supplicant

I added optee_client.device.mk in this project to facilitate the integration and keep the same default behavior/flags.

I can also contribute to the documentation if it's needed:
https://optee.readthedocs.io/en/latest/building/aosp/aosp.html

[massonju]

I've pushed a new version.

one condition was missing for TEEC_LOG_FILE.
if TEEC_LOG_FILE is not set and TEE_FS_PARENT_PATH is set to XXXX:
cflags: ["-DTEEC_LOG_FILE="XXXX/teec.log""]

[massonju]

I have no more changes, this patch is ready to review.
Please let me know if you need more infos

[jforissier]

Hi @massonju,

However all the flags defined in Android.bp of optee-client project must be set in "soong" way.

On our TI board we modify some of these flags. Before: (device/ti/am62x/optee/device-optee.mk)

CFG_TEE_FS_PARENT_PATH := /mnt/vendor/persist/tee

PRODUCT_PACKAGES += \
    libteec \
    tee-supplicant

[...]

After:

include vendor/linaro/optee_client/optee_client.device.mk
$(call soong_config_set,optee_client,cfg_tee_fs_parent_path,/mnt/vendor/persist/tee)

PRODUCT_PACKAGES += \
    libteec \
    tee-supplicant

I believe this example (before/after) would be good to have in the commit description.

I added optee_client.device.mk in this project to facilitate the integration and keep the same default behavior/flags.

Sounds good.

I can also contribute to the documentation if it's needed: https://optee.readthedocs.io/en/latest/building/aosp/aosp.html

You're welcome to do so!

With my comments addressed:

Acked-by: Jerome Forissier <[email protected]>

[jforissier]

Could a SPDX tag be used here instead of the full license text?

// SPDX-License-Identifier: Apache-2.0
//
// Copyright (C) 2024 The Android Open Source Project

package ...

[massonju]

yes sure I've replaced with the SPDX tag in my last push

[jforissier]

One more comment sorry :-/ also no need to add the markdown quotes (```) in the commit message, it is just plain text, use a blank line instead.

[massonju]

Thanks for the review/merge @jforissier