From 1413e4537ffa523db5c305f44928d5ebb81915ac Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Mon, 6 May 2024 02:19:37 +0000 Subject: [PATCH] Convert raven/preloaded_nanoapps.json's .mk file to Android.bp. 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/27170563, 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: 338005353 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: Ie4551fc30c75a401a615a729e651949696117352 --- factory_raven.mk | 3 +++ raven_generic.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/factory_raven.mk b/factory_raven.mk index 48226c4..1b41a1c 100644 --- a/factory_raven.mk +++ b/factory_raven.mk @@ -32,3 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_gn1_hat_tool fatp_imx586_hat_tool + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/raven_generic.mk b/raven_generic.mk index abbac40..6b16105 100644 --- a/raven_generic.mk +++ b/raven_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/raviole/device-raven.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/raven