Move device-specific vars from mainline common

Move a couple of variables out of BoardConfigMainlineCommon
because they vary either by device or by how they build in
AOSP vs internal.

Bug: 80410283
Test: presubmit
Change-Id: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
Merged-In: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
This commit is contained in:
Anton Hansson 2019-04-04 14:53:25 +01:00
parent 50d01d6aa3
commit 9ca0c27be6
3 changed files with 9 additions and 5 deletions

View File

@ -6,6 +6,8 @@
include build/make/target/board/BoardConfigMainlineCommon.mk
TARGET_NO_KERNEL := true
# This flag is set by mainline but isn't desired for GSI.
BOARD_USES_SYSTEM_OTHER_ODEX :=

View File

@ -4,17 +4,13 @@
# The generic product target doesn't have any hardware-specific pieces.
TARGET_NO_BOOTLOADER := true
TARGET_NO_KERNEL := true
TARGET_NO_RECOVERY := true
TARGET_USERIMAGES_USE_EXT4 := true
# Mainline devices must have /vendor and /product partitions.
TARGET_COPY_OUT_VENDOR := vendor
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_COPY_OUT_PRODUCT := product
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_VNDK_VERSION := current
@ -42,7 +38,6 @@ BOARD_CHARGER_ENABLE_SUSPEND := true
# Enable A/B update
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS := system
# Enable system property split for Treble
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

View File

@ -25,3 +25,10 @@ TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := generic
include build/make/target/board/BoardConfigMainlineCommon.mk
TARGET_NO_KERNEL := true
AB_OTA_PARTITIONS := system
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4