From c8df56f35e257fb55ee9d573b4a0a2fd87631dd5 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 25 Jan 2019 12:37:34 +0000 Subject: [PATCH] Remove non-existant packages from mainline_system Also add the health-check macro to the buildable products to make sure no other non-existant packages are added. Bug: 80410283 Test: build mainline_arm64 + mainline_system_arm64 Change-Id: I6c54de2f43b5ab0c9e0ddfa09fa7553c321e4aa7 --- target/product/mainline_arm64.mk | 1 + target/product/mainline_system.mk | 1 - target/product/mainline_system_arm64.mk | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index 93910722e..605092465 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -16,6 +16,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.mk) +$(call enforce-product-packages-exist,) PRODUCT_NAME := mainline_arm64 PRODUCT_DEVICE := mainline_arm64 diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index e6840368f..22d162684 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -75,7 +75,6 @@ PRODUCT_PACKAGES += \ android.hardware.radio.deprecated@1.0 \ android.hardware.secure_element@1.0 \ android.hardware.wifi@1.0 \ - android.hidl.base@1.0 \ libaudio-resampler \ liblogwrap \ liblz4 \ diff --git a/target/product/mainline_system_arm64.mk b/target/product/mainline_system_arm64.mk index 560dfd329..0b0929ee4 100644 --- a/target/product/mainline_system_arm64.mk +++ b/target/product/mainline_system_arm64.mk @@ -16,6 +16,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) +$(call enforce-product-packages-exist,) PRODUCT_NAME := mainline_system_arm64 PRODUCT_DEVICE := mainline_arm64