Merge "hikey: update the size for the partition of system and userdata" into main am: 9a5f48ee55

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2583198

Change-Id: Ib6563784fd3f56bb08dddbdc2ff9edeae52e8847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index 5f03ddb..78a16d0 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -22,14 +22,14 @@
 TARGET_NO_DTIMAGE := true
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
 ifeq ($(TARGET_USERDATAIMAGE_4GB), true) # to build for aosp-4g partition table
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 1595915776
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 1488961024
 else
 ifeq ($(TARGET_WITH_SWAP), true) # to build for swap-8g partition table
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 4246715904
 else
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 5588893184
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 4515151360
 endif
 endif
 BOARD_FLASH_BLOCK_SIZE := 131072