summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattijs Korpershoek2024-11-25 06:32:49 -0600
committerVishal Mahaveer2024-12-02 06:26:22 -0600
commit62de65160d9324fa0978ac25c3a4f2ae90b9864e (patch)
tree2ab1605bc1bf4f9125006c6979cb2cf6a5a54718
parent29e7628dca89c67040a3bf62e78b12ba933af497 (diff)
downloaddevice-ti-am62x-62de65160d9324fa0978ac25c3a4f2ae90b9864e.tar.gz
device-ti-am62x-62de65160d9324fa0978ac25c3a4f2ae90b9864e.tar.xz
device-ti-am62x-62de65160d9324fa0978ac25c3a4f2ae90b9864e.zip
common: Add health and DeviceDiagnostics to unknown packages
We use enforce-product-packages-exist() to make sure that we don't have any unknown packages in our build. On Android 15, we see: build/make/core/main.mk:1067: warning: device/ti/am62x/am62p.mk includes non-existent modules in PRODUCT_PACKAGES Offending entries: android.hardware.health@2.0-impl-default.recovery DeviceDiagnostics build/make/core/main.mk:1067: error: Build failed. android.hardware.health@2.0-impl-default.recovery is added to the PRODUCT_PACKAGES via: //build/make/target/product/base_vendor.mk DeviceDiagnostics is not defined at all. Since we don't want to patch AOSP files, add the unknown modules to the allowlist. Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
-rw-r--r--am62p.mk2
-rw-r--r--am62x.mk2
2 files changed, 4 insertions, 0 deletions
diff --git a/am62p.mk b/am62p.mk
index 3d982f4..7c0ab58 100644
--- a/am62p.mk
+++ b/am62p.mk
@@ -34,6 +34,8 @@ PRODUCT_VENDOR_PROPERTIES += \
34 34
35# clean-up all unknown PRODUCT_PACKAGES 35# clean-up all unknown PRODUCT_PACKAGES
36allowed_list := product_manifest.xml 36allowed_list := product_manifest.xml
37allowed_list += android.hardware.health@2.0-impl-default.recovery
38allowed_list += DeviceDiagnostics
37$(call enforce-product-packages-exist, $(allowed_list)) 39$(call enforce-product-packages-exist, $(allowed_list))
38 40
39include device/ti/am62x/optee/device-optee.mk 41include device/ti/am62x/optee/device-optee.mk
diff --git a/am62x.mk b/am62x.mk
index 7fd1162..ed42054 100644
--- a/am62x.mk
+++ b/am62x.mk
@@ -78,6 +78,8 @@ PRODUCT_VENDOR_PROPERTIES += \
78 78
79# clean-up all unknown PRODUCT_PACKAGES 79# clean-up all unknown PRODUCT_PACKAGES
80allowed_list := product_manifest.xml 80allowed_list := product_manifest.xml
81allowed_list += android.hardware.health@2.0-impl-default.recovery
82allowed_list += DeviceDiagnostics
81$(call enforce-product-packages-exist, $(allowed_list)) 83$(call enforce-product-packages-exist, $(allowed_list))
82 84
83include device/ti/am62x/optee/device-optee.mk 85include device/ti/am62x/optee/device-optee.mk