From 5a9c96ec32372750693ddbb5c414595d39a0de2d Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 17 Jan 2019 15:49:46 +0100 Subject: [PATCH] Be compatible with AOSP master BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE In that case, don't enforce system image size We will need to implement after build checks to ensure we still work on older devices --- phhgsi_a64_a/BoardConfig.mk | 2 ++ phhgsi_arm64_a/BoardConfig.mk | 2 ++ phhgsi_arm64_ab/BoardConfig.mk | 2 ++ phhgsi_arm_a/BoardConfig.mk | 2 ++ phhgsi_arm_ab/BoardConfig.mk | 2 ++ 5 files changed, 10 insertions(+) diff --git a/phhgsi_a64_a/BoardConfig.mk b/phhgsi_a64_a/BoardConfig.mk index 221e881..228e190 100644 --- a/phhgsi_a64_a/BoardConfig.mk +++ b/phhgsi_a64_a/BoardConfig.mk @@ -1,5 +1,7 @@ include build/make/target/board/generic_arm_a/BoardConfig.mk include device/phh/treble/board-base.mk +ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000 +endif TARGET_USES_64_BIT_BINDER := true diff --git a/phhgsi_arm64_a/BoardConfig.mk b/phhgsi_arm64_a/BoardConfig.mk index e2465d5..4cf5426 100644 --- a/phhgsi_arm64_a/BoardConfig.mk +++ b/phhgsi_arm64_a/BoardConfig.mk @@ -1,4 +1,6 @@ include build/make/target/board/generic_arm64_a/BoardConfig.mk include device/phh/treble/board-base.mk +ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 +endif diff --git a/phhgsi_arm64_ab/BoardConfig.mk b/phhgsi_arm64_ab/BoardConfig.mk index 612ff3e..2b59f0f 100644 --- a/phhgsi_arm64_ab/BoardConfig.mk +++ b/phhgsi_arm64_ab/BoardConfig.mk @@ -1,4 +1,6 @@ include build/make/target/board/generic_arm64_ab/BoardConfig.mk include device/phh/treble/board-base.mk +ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 +endif diff --git a/phhgsi_arm_a/BoardConfig.mk b/phhgsi_arm_a/BoardConfig.mk index b3518b0..b21d690 100644 --- a/phhgsi_arm_a/BoardConfig.mk +++ b/phhgsi_arm_a/BoardConfig.mk @@ -1,4 +1,6 @@ include build/make/target/board/generic_arm_a/BoardConfig.mk include device/phh/treble/board-base.mk +ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1313583104 +endif diff --git a/phhgsi_arm_ab/BoardConfig.mk b/phhgsi_arm_ab/BoardConfig.mk index 1df6cd1..18aaace 100644 --- a/phhgsi_arm_ab/BoardConfig.mk +++ b/phhgsi_arm_ab/BoardConfig.mk @@ -1,4 +1,6 @@ include build/make/target/board/generic_arm_ab/BoardConfig.mk include device/phh/treble/board-base.mk +ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824 +endif