From d40d176dbaef7edb5b09711bc7ec6a6f079f9f7b Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 24 Sep 2021 10:11:36 +0800 Subject: [PATCH] create a makefile that holds non AB device setting Bug: 189894781 Test: build ROM with the binary inside Change-Id: I99f2b4d3bd57b57ffd3b5066b1306c6fa17c2c85 --- target/product/aosp_arm64.mk | 1 + target/product/aosp_x86_64.mk | 1 + target/product/base_vendor.mk | 5 ----- target/product/non_ab_device.mk | 5 +++++ 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 target/product/non_ab_device.mk diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 38f82a2d60..01897b77d2 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -53,6 +53,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) # # Special settings for GSI releasing diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 5d782644dc..b3cfae4385 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -56,6 +56,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) $(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) # # Special settings for GSI releasing diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index a087f4ce86..58b4bb474b 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -77,11 +77,6 @@ PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 += \ PRODUCT_PACKAGES += \ vendor_compatibility_matrix.xml \ -# Packages to update the recovery partition, which will be installed on -# /vendor. TODO(b/141648565): Don't install these unless they're needed. -PRODUCT_PACKAGES += \ - applypatch - # Base modules and settings for the debug ramdisk, which is then packed # into a boot-debug.img and a vendor_boot-debug.img. PRODUCT_PACKAGES += \ diff --git a/target/product/non_ab_device.mk b/target/product/non_ab_device.mk new file mode 100644 index 0000000000..6dc4506e26 --- /dev/null +++ b/target/product/non_ab_device.mk @@ -0,0 +1,5 @@ +# Packages to update the recovery partition, which will be installed on +# /vendor. Don't install these unless they're needed. +PRODUCT_PACKAGES += \ + applypatch +