Merge "create a makefile that holds non AB device setting" am: 95e5729ee5

Original change: https://android-review.googlesource.com/c/platform/build/+/1774706

Change-Id: I3c94bb10b40a80d982dfceb0902f866d1ca24dea
This commit is contained in:
Adam Shih 2021-09-28 03:53:54 +00:00 committed by Automerger Merge Worker
commit 869356db7f
4 changed files with 7 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -78,11 +78,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 += \

View File

@ -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