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

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

Browse Source 
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: I80204d2868b209273eb7d696ad8359c9d7a26c05
This commit is contained in:
Nelson Li
2024-04-30 07:54:05 +00:00
parent 07506e14de
commit a01a9b8e49
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
comet_generic.mk
View File

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

3
factory_comet.mk
View File

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