commit 1c1a6c928122365ff66e1f9ca8297f18cea59c4b
author Isaac Chen <ycchen@google.com> Mon Sep 18 04:37:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 18 04:37:16 2017 +0000
tree a5311960ffc16cbc85c7e4e784f098352a8f080e
parent ab5bceaedc6d61f324d3d118fd20e28cd9f0d10e
parent 113fbe4468fd8467cd8047cf86e0b55ce3019d01

Merge "Set default size for 32-bit GSI to 1 GB" into oc-mr1-dev
am: 113fbe4468

Change-Id: Id02b4a81e61252c293b1a64707a0bf5de5bfc818

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 57a5196..e3a6707 100644
--- a/target/board/generic_arm_a/BoardConfig.mk
+++ b/target/board/generic_arm_a/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 := 950009856
+
 TARGET_ARCH := arm
 TARGET_ARCH_VARIANT := armv7-a-neon
 TARGET_CPU_ABI := armeabi-v7a

target/board/treble_common_32.mk

diff --git a/target/board/treble_common_32.mk b/target/board/treble_common_32.mk
index 2c3447b..dbe0899 100644
--- a/target/board/treble_common_32.mk
+++ b/target/board/treble_common_32.mk
@@ -16,5 +16,6 @@
 
 include build/make/target/board/treble_common.mk
 
-# Partition size is default 906MB for 32 bits projects
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 950009856
+# Partition size defaults to 1 GB (1024 MB) for 32-bit products. It can
+# be overwritten in specific BoardConfig.mk, if so desired.
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824