commit 1d1725d7ebe8cb5e71f1ebb6ffd06f2ea82714d9
author Anton Hansson <hansson@google.com> Fri Feb 08 06:44:15 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Feb 08 06:44:15 2019 -0800
tree ccfa9be4b856bc93c19f7fa252cd41563455aa1c
parent 0b7030c8e19c2c085ccf3f37ee152551197cfd27
parent 68028611f089c2de2dc07b355eafd5ff04efca01

Merge "Remove non-existant packages from mainline_system" am: 76d8591417
am: 68028611f0

Change-Id: I2b00e756beb9b105fcf8ffe4a0a49743ada0e220

target/product/mainline_arm64.mk

diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk
index 9391072..6050924 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

target/product/mainline_system.mk

diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index e684036..22d1626 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -75,7 +75,6 @@
     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 \

target/product/mainline_system_arm64.mk

diff --git a/target/product/mainline_system_arm64.mk b/target/product/mainline_system_arm64.mk
index 560dfd3..0b0929e 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