From 33473b84867cb454be62693b078548d65ed238d6 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Tue, 30 Apr 2024 07:51:08 +0000 Subject: [PATCH] Convert p24_common/preloaded_nanoapps.json's .mk file to Android.bp. p24_common includes 5 devices. 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: I44832b1862da9c000a7baf20ea9d6e4874ed9c54 --- caiman_generic.mk | 3 +++ factory_caiman.mk | 3 +++ factory_komodo.mk | 3 +++ factory_ripcurrentpro.mk | 3 +++ factory_tokay.mk | 3 +++ komodo_generic.mk | 3 +++ ripcurrentpro_generic.mk | 3 +++ tokay_generic.mk | 3 +++ 8 files changed, 24 insertions(+) diff --git a/caiman_generic.mk b/caiman_generic.mk index 6b8acb18..3efc4de4 100644 --- a/caiman_generic.mk +++ b/caiman_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/caimito/device-caiman.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common diff --git a/factory_caiman.mk b/factory_caiman.mk index dc4cd3ce..5919c0d7 100644 --- a/factory_caiman.mk +++ b/factory_caiman.mk @@ -59,3 +59,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test PRODUCT_WITHOUT_TTS_VOICE_PACKS := true + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_komodo.mk b/factory_komodo.mk index 6d1cf6b7..b480957c 100644 --- a/factory_komodo.mk +++ b/factory_komodo.mk @@ -59,3 +59,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool factory_lwis_client_test PRODUCT_WITHOUT_TTS_VOICE_PACKS := true + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_ripcurrentpro.mk b/factory_ripcurrentpro.mk index 3038e8b4..bbaf425e 100644 --- a/factory_ripcurrentpro.mk +++ b/factory_ripcurrentpro.mk @@ -57,3 +57,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory # Factory binaries of camera PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4_tele_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_km4cm4_front_hat_tool fatp_tk4_front_hat_tool + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_tokay.mk b/factory_tokay.mk index 6574b5b9..accf50c8 100644 --- a/factory_tokay.mk +++ b/factory_tokay.mk @@ -59,3 +59,6 @@ SOONG_CONFIG_gpssdk_gpsconf := factory PRODUCT_PACKAGES += fatp_km4cm4tk4_wide_hat_tool fatp_km4cm4tk4_ultrawide_hat_tool fatp_tk4_front_hat_tool factory_lwis_client_test PRODUCT_WITHOUT_TTS_VOICE_PACKS := true + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/komodo_generic.mk b/komodo_generic.mk index 686ba6c7..5d89593e 100644 --- a/komodo_generic.mk +++ b/komodo_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/caimito/device-komodo.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common diff --git a/ripcurrentpro_generic.mk b/ripcurrentpro_generic.mk index d92fc54c..4d3bdd75 100644 --- a/ripcurrentpro_generic.mk +++ b/ripcurrentpro_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/caimito/device-ripcurrentpro.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common diff --git a/tokay_generic.mk b/tokay_generic.mk index 0b1cd22f..a8870261 100644 --- a/tokay_generic.mk +++ b/tokay_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/caimito/device-tokay.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common