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

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

Browse source 
p23_common includes 4 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/27008138, ag/27046793, ag/27008143, and
ag/27056982, 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: 332219400
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: Ife53dddd3469de8eacb6d862bc1b8d9de3ce427e
This commit is contained in:
Nelson Li 2024-04-26 06:28:04 +00:00
parent e48dd856cd
commit 1223265afb
6 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
factory_husky.mk
View file

@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Factory binaries of camera
PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

3
factory_ripcurrent.mk
View file

@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Factory binaries of camera
PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_sb3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

3
factory_shiba.mk
View file

@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Factory binaries of camera
PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

3
husky_generic.mk
View file

@ -15,3 +15,6 @@
#
$(call inherit-product, device/google/shusky/device-husky.mk)
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

3
ripcurrent_generic.mk
View file

@ -15,3 +15,6 @@
#
$(call inherit-product, device/google/shusky/device-ripcurrent.mk)
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

3
shiba_generic.mk
View file

@ -15,3 +15,6 @@
#
$(call inherit-product, device/google/shusky/device-shiba.mk)
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common