Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 869356db authored by Adam Shih's avatar Adam Shih Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I3c94bb10b40a80d982dfceb0902f866d1ca24dea
parents 38a6187c 95e5729e

target/product/aosp_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

target/product/aosp_x86_64.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

target/product/base_vendor.mk

+0 −5
Original line number Diff line number Diff line
@@ -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 += \

target/product/non_ab_device.mk

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# Packages to update the recovery partition, which will be installed on

# /vendor. Don't install these unless they're needed.

PRODUCT_PACKAGES += \

    applypatch