commit f7ade144dd9c9cf1428da5b6a71c46e1b7d15666
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 29 21:11:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 29 21:11:32 2017 +0000
tree 01995d9b2e93cbefe1562c2adcc09e47c7bc575d
parent cb71f5706ea77cc44bfed8c26042a8931c012bc1
parent 16cda2fbffc4b98dd000d6532e7e145893a45066

Merge "Use computed salt for AVB-signed images." into oc-mr1-dev

target/board/generic_arm_a/BoardConfig.mk

diff --git a/target/board/generic_arm_a/BoardConfig.mk b/target/board/generic_arm_a/BoardConfig.mk
index e3a6707..d930749 100644
--- a/target/board/generic_arm_a/BoardConfig.mk
+++ b/target/board/generic_arm_a/BoardConfig.mk
@@ -17,7 +17,7 @@
 include build/make/target/board/treble_common_32.mk
 
 # Overwrite the setting in treble_common_32.mk for non-A/B arm GSI
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 950009856
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368 # 768MB
 
 TARGET_ARCH := arm
 TARGET_ARCH_VARIANT := armv7-a-neon

target/board/generic_arm_ab/BoardConfig.mk

diff --git a/target/board/generic_arm_ab/BoardConfig.mk b/target/board/generic_arm_ab/BoardConfig.mk
index ae8de14..011bcdf 100644
--- a/target/board/generic_arm_ab/BoardConfig.mk
+++ b/target/board/generic_arm_ab/BoardConfig.mk
@@ -16,6 +16,9 @@
 
 include build/make/target/board/treble_common_32.mk
 
+# Overwrite the setting in treble_common_32.mk for non-A/B arm GSI
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368 # 768MB
+
 TARGET_ARCH := arm
 TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_CPU_ABI := armeabi-v7a