Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" am: 9a0dd5b288

am: dae8049421

Change-Id: I1d4f24d68ed3fbc626ecbe1ac7db448e1ae559a6
This commit is contained in:
Anton Hansson 2019-01-16 09:03:27 -08:00 committed by android-build-merger
commit 8dad70660d
2 changed files with 6 additions and 2 deletions

View file

@ -25,8 +25,8 @@ TARGET_USERIMAGES_USE_F2FS := true
# Enable dynamic system image size and reserved 64MB in it.
BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864
# GSI always requires separate vendor packages to vendor.img
TARGET_COPY_OUT_VENDOR := vendor
# GSI forces product packages to /system for now.
TARGET_COPY_OUT_PRODUCT := system/product
# Creates metadata partition mount point under root for
# the devices with metadata parition

View file

@ -8,6 +8,10 @@ TARGET_NO_KERNEL := true
TARGET_USERIMAGES_USE_EXT4 := true
# Mainline devices must have /vendor and /product partitions.
TARGET_COPY_OUT_VENDOR := vendor
TARGET_COPY_OUT_PRODUCT := product
# system-as-root is mandatory from Android P
TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true