From 2dd9ebfb37909b82bcba0344a75a241ee537db47 Mon Sep 17 00:00:00 2001
From: Nelson Li <nelsonli@google.com>
Date: Fri, 3 May 2024 03:18:48 +0000
Subject: [PATCH] Convert slider/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/27170565, ag/27170566, 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: 338332183
Test: 1. lunch <product_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: I97798f0e7876ceb016a31f7da74508fe5a701915
---
 factory_slider.mk   | 3 +++
 factory_whitefin.mk | 2 ++
 slider_generic.mk   | 3 +++
 whitefin_generic.mk | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/factory_slider.mk b/factory_slider.mk
index 1c51e91..1359fc6 100644
--- a/factory_slider.mk
+++ b/factory_slider.mk
@@ -23,3 +23,6 @@ PRODUCT_DEVICE := slider
 PRODUCT_MODEL := Factory build on Slider
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_whitefin.mk b/factory_whitefin.mk
index 0dd0a4f..4d360c6 100644
--- a/factory_whitefin.mk
+++ b/factory_whitefin.mk
@@ -29,3 +29,5 @@ PRODUCT_MANUFACTURER := Google
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/slider_generic.mk b/slider_generic.mk
index 52d2542..419e587 100644
--- a/slider_generic.mk
+++ b/slider_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/raviole/device-slider.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider
diff --git a/whitefin_generic.mk b/whitefin_generic.mk
index a56c609..f0616c6 100644
--- a/whitefin_generic.mk
+++ b/whitefin_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/raviole/device-whitefin.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider