diff options
| author | 2019-04-04 14:53:25 +0100 | |
|---|---|---|
| committer | 2019-04-04 17:33:51 +0100 | |
| commit | 91aa9414c011a580287ea5f5bbc435de058f76e8 (patch) | |
| tree | e4daa19fcfd396de09e9b00e6561803168926604 | |
| parent | f78f0ce5429cc0154b6502858378ad2f936399da (diff) | |
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
| -rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 2 | ||||
| -rw-r--r-- | target/board/BoardConfigMainlineCommon.mk | 5 | ||||
| -rw-r--r-- | target/board/mainline_arm64/BoardConfig.mk | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index d53995c03b..eee65f42dd 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -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 := diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk index acbd11d431..8d2957ce39 100644 --- a/target/board/BoardConfigMainlineCommon.mk +++ b/target/board/BoardConfigMainlineCommon.mk @@ -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 diff --git a/target/board/mainline_arm64/BoardConfig.mk b/target/board/mainline_arm64/BoardConfig.mk index 521d97655a..8bb6212c1f 100644 --- a/target/board/mainline_arm64/BoardConfig.mk +++ b/target/board/mainline_arm64/BoardConfig.mk @@ -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 |