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

Commit 9ca0c27b authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent 50d01d6a

target/board/BoardConfigGsiCommon.mk

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

target/board/BoardConfigMainlineCommon.mk

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

target/board/mainline_arm64/BoardConfig.mk

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