StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline"

Browse Source 
am: 9a0dd5b288

Change-Id: I1dc2536767eb7c2a294a2359f1b6c47444f0dfe0
This commit is contained in:
Anton Hansson
2019-01-16 08:57:14 -08:00
committed by android-build-merger
parent e360c96bc2 9a0dd5b288
commit dae8049421
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/board/BoardConfigGsiCommon.mk
View File

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

4
target/board/BoardConfigMainlineCommon.mk
View File

@@ -8,6 +8,10 @@ TARGET_NO_KERNEL := true
TARGET_USERIMAGES_USE_EXT4 := 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 # system-as-root is mandatory from Android P
TARGET_NO_RECOVERY := true TARGET_NO_RECOVERY := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true