diff options
author | Mattijs Korpershoek | 2024-11-25 06:32:49 -0600 |
---|---|---|
committer | Vishal Mahaveer | 2024-12-02 06:26:22 -0600 |
commit | 62de65160d9324fa0978ac25c3a4f2ae90b9864e (patch) | |
tree | 2ab1605bc1bf4f9125006c6979cb2cf6a5a54718 | |
parent | 29e7628dca89c67040a3bf62e78b12ba933af497 (diff) | |
download | device-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.mk | 2 | ||||
-rw-r--r-- | am62x.mk | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -34,6 +34,8 @@ PRODUCT_VENDOR_PROPERTIES += \ | |||
34 | 34 | ||
35 | # clean-up all unknown PRODUCT_PACKAGES | 35 | # clean-up all unknown PRODUCT_PACKAGES |
36 | allowed_list := product_manifest.xml | 36 | allowed_list := product_manifest.xml |
37 | allowed_list += android.hardware.health@2.0-impl-default.recovery | ||
38 | allowed_list += DeviceDiagnostics | ||
37 | $(call enforce-product-packages-exist, $(allowed_list)) | 39 | $(call enforce-product-packages-exist, $(allowed_list)) |
38 | 40 | ||
39 | include device/ti/am62x/optee/device-optee.mk | 41 | include device/ti/am62x/optee/device-optee.mk |
@@ -78,6 +78,8 @@ PRODUCT_VENDOR_PROPERTIES += \ | |||
78 | 78 | ||
79 | # clean-up all unknown PRODUCT_PACKAGES | 79 | # clean-up all unknown PRODUCT_PACKAGES |
80 | allowed_list := product_manifest.xml | 80 | allowed_list := product_manifest.xml |
81 | allowed_list += android.hardware.health@2.0-impl-default.recovery | ||
82 | allowed_list += DeviceDiagnostics | ||
81 | $(call enforce-product-packages-exist, $(allowed_list)) | 83 | $(call enforce-product-packages-exist, $(allowed_list)) |
82 | 84 | ||
83 | include device/ti/am62x/optee/device-optee.mk | 85 | include device/ti/am62x/optee/device-optee.mk |