commit 58251fe44d120b284bcdc47c3f28fbdfa6fb524d
author Ian Pedowitz <ijpedowitz@google.com> Tue Aug 11 15:41:19 2015 -0700
committer Ian Pedowitz <ijpedowitz@google.com> Tue Aug 11 15:41:19 2015 -0700
tree 13997d40d7f72b9e0fe51c52f2a58e35b9be8f06
parent 8ecce002390172310a3e9d7ab3e92f647c23b1fb
parent 87eb4007e16f67d156f646982764d5edaa16e0cb

resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp

Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa

target/board/generic/BoardConfig.mk

diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index fb6c920..4e5504e 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -68,7 +68,7 @@
 VSYNC_EVENT_PHASE_OFFSET_NS := 0
 
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

target/board/generic_arm64/BoardConfig.mk

diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk
index 0c4d59c..b757da1 100644
--- a/target/board/generic_arm64/BoardConfig.mk
+++ b/target/board/generic_arm64/BoardConfig.mk
@@ -76,7 +76,7 @@
 USE_OPENGL_RENDERER := true
 
 TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1258291200
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4