Evolution-X-Tensor/device_google_caimito
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert p24_common/preloaded_nanoapps.json's .mk file to Android.bp.

Browse source 
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 `<DEVICE>_generic.mk`
and `factory_<DEVICE>.mk` files will allow factory products and
non-factory products to use different preloaded_nanoapps.json.

Bug: 336452008
Test: 1. lunch <device_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      2. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the <device_name> version.
      3. lunch factory_<device_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      4. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the factory version.
Change-Id: I44832b1862da9c000a7baf20ea9d6e4874ed9c54
This commit is contained in:
Nelson Li 2024-04-30 07:51:08 +00:00
parent f52d88caf5
commit 33473b8486
8 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
caiman_generic.mk
View file

@ -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

3
factory_caiman.mk
View file

@ -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

3
factory_komodo.mk
View file

@ -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

3
factory_ripcurrentpro.mk
View file

@ -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

3
factory_tokay.mk
View file

@ -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

3
komodo_generic.mk
View file

@ -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

3
ripcurrentpro_generic.mk
View file

@ -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

3
tokay_generic.mk
View file

@ -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