From a01a9b8e49562c4640bc55460335c2b05e103f1a Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Tue, 30 Apr 2024 07:54:05 +0000 Subject: [PATCH] Convert comet/preloaded_nanoapps.json's .mk file to Android.bp. Since `preloaded_nanoapps.json` has different configurations for `factory` products and `non-factory` products, `soong_namespace {}` needs to be added to the converted Android.bp file to avoid misuse. Additionally, due to ag/27080050, ag/27081111, ag/27095942, ag/27095945 ag/27095945, ag/27138057, ag/27138236, a common inheritance layer has been added to all `non-factory` products. Therefore, setting different `PRODUCT_SOONG_NAMESPACES` in the corresponding `_generic.mk` and `factory_.mk` files will allow factory products and non-factory products to use different preloaded_nanoapps.json. Bug: 336452008 Test: 1. lunch -trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 2. Check ./out/target/product//.../preloaded_nanoapps.json It should be the version. 3. lunch factory_-trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 4. Check ./out/target/product//.../preloaded_nanoapps.json It should be the factory version. Change-Id: I80204d2868b209273eb7d696ad8359c9d7a26c05 --- comet_generic.mk | 3 +++ factory_comet.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/comet_generic.mk b/comet_generic.mk index 0036010..cf5ef0e 100644 --- a/comet_generic.mk +++ b/comet_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/comet/device-comet.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common diff --git a/factory_comet.mk b/factory_comet.mk index f53e94f..45b2587 100644 --- a/factory_comet.mk +++ b/factory_comet.mk @@ -60,3 +60,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory PRODUCT_PACKAGES += fatp_ct3_wide_hat_tool fatp_ct3_tele_hat_tool fatp_ct3_ultrawide_hat_tool PRODUCT_WITHOUT_TTS_VOICE_PACKS := true + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory