Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38

Original change: https://android-review.googlesource.com/c/platform/build/+/1676586

Change-Id: I95338c4b55ce3352b4ef43c79871debc1bd9ed43
This commit is contained in:
Roman Kiryanov 2021-04-15 06:30:50 +00:00 committed by Automerger Merge Worker
commit 56c9341ba1
2 changed files with 1 additions and 4 deletions

View File

@ -74,7 +74,7 @@ endif
#vendor boot
BOARD_INCLUDE_DTB_IN_BOOTIMG := false
BOARD_BOOT_HEADER_VERSION := 3
BOARD_BOOT_HEADER_VERSION := 4
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x06000000
BOARD_RAMDISK_USE_LZ4 := true

View File

@ -57,9 +57,6 @@ BOARD_USES_RECOVERY_AS_BOOT := true
BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_BOOT_HEADER_VERSION := 3
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
# Wifi.
BOARD_WLAN_DEVICE := emulator
BOARD_HOSTAPD_DRIVER := NL80211