From 74d07ff8bda42e07cc979b8a7793a2b5c1e8829e Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 14 Jun 2018 13:26:28 -0700 Subject: [PATCH] Add BOARD_SUPER_PARTITION_* Test: builds Test: build with BOARD_SUPER_PARTITION_SIZE and BOARD_SUPER_PARTITION_PARTITION_LIST defined Bug: 79106666 Change-Id: Ifcd50ecab22ef096ff1eb386f8d87e16fffdcf5e --- core/main.mk | 20 ++++++++++++++++++++ core/product.mk | 2 ++ 2 files changed, 22 insertions(+) diff --git a/core/main.mk b/core/main.mk index a2f624ccb7..a08e0dfd15 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1275,6 +1275,26 @@ else # TARGET_BUILD_APPS # Building a full system-- the default is to build droidcore droid_targets: droidcore dist_files +ifdef USE_LOGICAL_PARTITIONS +ifdef BOARD_SUPER_PARTITION_SIZE +ifdef BOARD_SUPER_PARTITION_PARTITION_LIST + +droid_targets: check_android_partition_sizes + +.PHONY: check_android_partition_sizes +check_android_partition_sizes: partition_size_list=$(foreach p,$(BOARD_SUPER_PARTITION_PARTITION_LIST),$(BOARD_$(call to-upper,$(p))IMAGE_PARTITION_SIZE)) +check_android_partition_sizes: sum_sizes_expr=$(subst $(space),+,$(partition_size_list)) +check_android_partition_sizes: + if [ $$(( $(sum_sizes_expr) )) -gt $(BOARD_SUPER_PARTITION_SIZE) ]; then \ + echo The sum of sizes of all logical partitions is larger than BOARD_SUPER_PARTITION_SIZE.; \ + echo $(sum_sizes_expr) == $$(( $(sum_sizes_expr) )) '>' $(BOARD_SUPER_PARTITION_SIZE); \ + exit 1; \ + fi + +endif # BOARD_SUPER_PARTITION_PARTITION_LIST +endif # BOARD_SUPER_PARTITION_SIZE +endif # USE_LOGICAL_PARTITIONS + endif # TARGET_BUILD_APPS .PHONY: docs diff --git a/core/product.mk b/core/product.mk index 9eeacf06db..375fb724e0 100644 --- a/core/product.mk +++ b/core/product.mk @@ -380,6 +380,8 @@ _product_stash_var_list += \ _product_stash_var_list += \ BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE \ BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \ + BOARD_SUPER_PARTITION_SIZE \ + BOARD_SUPER_PARTITION_PARTITION_LIST \ # # Mark the variables in _product_stash_var_list as readonly