Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0d14a86 authored by Hridya Valsaraju's avatar Hridya Valsaraju Committed by android-build-merger
Browse files

Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit" am: acfbc544 

am: a7f33ab8

Change-Id: I9b8df9e495a20bc01bbe383c3f1d359faa9cea94
parents c6399590 a7f33ab8

core/Makefile

+15 −1
Original line number Diff line number Diff line
@@ -3430,6 +3430,10 @@ ifndef BOARD_SUPER_PARTITION_WARN_LIMIT 
BOARD_SUPER_PARTITION_WARN_LIMIT := $$(($(BOARD_SUPER_PARTITION_SIZE) * 95 / 100))

endif



ifndef BOARD_SUPER_PARTITION_ERROR_LIMIT

BOARD_SUPER_PARTITION_ERROR_LIMIT := $(BOARD_SUPER_PARTITION_SIZE)

endif



droid_targets: check-all-partition-sizes



.PHONY: check-all-partition-sizes check-all-partition-sizes-nodeps
@@ -3466,6 +3470,8 @@ endif 
# $(3): list of partition names

# $(4): human-readable warn size string

# $(5): warn size expression

# $(6): human readable error size string

# $(7): error size expression

define check-sum-of-partition-sizes

  partition_size_list="$$(for i in $(call read-size-of-partitions,$(3)); do \

    echo $(call round-partition-size,$${i}); \
@@ -3476,6 +3482,12 @@ define check-sum-of-partition-sizes 
    echo $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '>' "$(2)" '==' $$(( $(2) )); \

    exit 1; \

  else \

    if [[ ! -z "$(7)" ]] && [ $$(( $${sum_sizes_expr} )) -gt $$(( $(7) )) ]; then \

        echo "!!!! ERROR !!!! The sum of sizes of [$(strip $(3))] is larger than $(strip $(6)):"; \

        echo $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '>' "$(7)" '==' $$(( $(7) )); \

        echo "Super partition is" $$(( $$(( $$(( $${sum_sizes_expr} )) * 100)) / $$(( $(2) )) )) "percent occupied!"; \

        exit 1; \

    fi; \

    if [[ ! -z "$(5)" ]] && [ $$(( $${sum_sizes_expr} )) -gt $$(( $(5) )) ]; then \

        echo "!!!! WARNING !!!! The sum of sizes of [$(strip $(3))] is larger than $(strip $(4)):"; \

        echo $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '>' "$(5)" '==' $$(( $(5) )); \
@@ -3492,7 +3504,9 @@ define check-all-partition-sizes-target 
    $(call check-sum-of-partition-sizes,BOARD_SUPER_PARTITION_SIZE$(if $(call super-slot-suffix), / 2), \

      $(BOARD_SUPER_PARTITION_SIZE)$(if $(call super-slot-suffix), / 2),$(BOARD_SUPER_PARTITION_PARTITION_LIST), \

      BOARD_SUPER_PARTITION_WARN_LIMIT$(if $(call super-slot-suffix), / 2), \

      $(BOARD_SUPER_PARTITION_WARN_LIMIT)$(if $(call super-slot-suffix), / 2)) \

      $(BOARD_SUPER_PARTITION_WARN_LIMIT)$(if $(call super-slot-suffix), / 2), \

      BOARD_SUPER_PARTITION_ERROR_LIMIT$(if $(call super-slot-suffix), / 2), \

      $(BOARD_SUPER_PARTITION_ERROR_LIMIT)$(if $(call super-slot-suffix), / 2)) \

  ))



  # For each group, check sum(partitions in group) <= group size