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

Commit ec0ac404 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it... 

Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" am: 9885f2f7 am: 72c77683 am: 950fef5e am: 5d55b2b3

Original change: https://android-review.googlesource.com/c/platform/build/+/1843156

Change-Id: I614ea1e8ade24d7d7393ee24406be47f27ac0bf6
parents 525baae1 5d55b2b3

core/config.mk

+6 −3
Original line number Diff line number Diff line
@@ -723,10 +723,13 @@ else 
endif

.KATI_READONLY := BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES



ifdef PRODUCT_SHIPPING_API_LEVEL

  ifneq ($(call numbers_less_than,$(PRODUCT_SHIPPING_API_LEVEL),$(BOARD_SYSTEMSDK_VERSIONS)),)

    $(error BOARD_SYSTEMSDK_VERSIONS ($(BOARD_SYSTEMSDK_VERSIONS)) must all be greater than or equal to PRODUCT_SHIPPING_API_LEVEL ($(PRODUCT_SHIPPING_API_LEVEL)))

min_systemsdk_version := $(firstword $(BOARD_API_LEVEL) $(BOARD_SHIPPING_API_LEVEL) $(PRODUCT_SHIPPING_API_LEVEL))

ifneq (,$(min_systemsdk_version))

ifneq ($(call numbers_less_than,$(min_systemsdk_version),$(BOARD_SYSTEMSDK_VERSIONS)),)

  $(error BOARD_SYSTEMSDK_VERSIONS ($(BOARD_SYSTEMSDK_VERSIONS)) must all be greater than or equal to BOARD_API_LEVEL, BOARD_SHIPPING_API_LEVEL or PRODUCT_SHIPPING_API_LEVEL ($(min_systemsdk_version)))

endif

endif

ifdef PRODUCT_SHIPPING_API_LEVEL

  ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),28),)

    ifneq ($(TARGET_IS_64_BIT), true)

      ifneq ($(TARGET_USES_64_BIT_BINDER), true)