From 1223265afb17e9f7d7ac0195266fa0123a92d2d6 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Fri, 26 Apr 2024 06:28:04 +0000 Subject: [PATCH] Convert p23_common/preloaded_nanoapps.json's .mk file to Android.bp. 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 `_generic.mk` and `factory_.mk` files will allow factory products and non-factory products to use different preloaded_nanoapps.json. Bug: 332219400 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: Ife53dddd3469de8eacb6d862bc1b8d9de3ce427e --- factory_husky.mk | 3 +++ factory_ripcurrent.mk | 3 +++ factory_shiba.mk | 3 +++ husky_generic.mk | 3 +++ ripcurrent_generic.mk | 3 +++ shiba_generic.mk | 3 +++ 6 files changed, 18 insertions(+) diff --git a/factory_husky.mk b/factory_husky.mk index 5c2c0ce..c44fc7e 100644 --- a/factory_husky.mk +++ b/factory_husky.mk @@ -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 diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk index b7c64c5..17cf8e8 100644 --- a/factory_ripcurrent.mk +++ b/factory_ripcurrent.mk @@ -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 diff --git a/factory_shiba.mk b/factory_shiba.mk index d20f113..2564bfe 100644 --- a/factory_shiba.mk +++ b/factory_shiba.mk @@ -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 diff --git a/husky_generic.mk b/husky_generic.mk index 2bf7caf..61489f4 100644 --- a/husky_generic.mk +++ b/husky_generic.mk @@ -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 diff --git a/ripcurrent_generic.mk b/ripcurrent_generic.mk index bb1afb3..3789f83 100644 --- a/ripcurrent_generic.mk +++ b/ripcurrent_generic.mk @@ -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 diff --git a/shiba_generic.mk b/shiba_generic.mk index 064301e..f08b683 100644 --- a/shiba_generic.mk +++ b/shiba_generic.mk @@ -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