diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-05 02:02:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-05 02:02:22 +0000 |
| commit | 72c77683202305bd883300ff9e2c528e3bd5282a (patch) | |
| tree | 9e0ead74cae10f8aae53ee5f84b2d40d3b631e1e | |
| parent | 64fc316e471f420b2146115578f4b111000d6159 (diff) | |
| parent | 9885f2f74413082dcebd4363a62e324038706382 (diff) | |
| download | build-72c77683202305bd883300ff9e2c528e3bd5282a.tar.gz | |
Merge "BOARD_SYSTEMSDK_VERSIONS should depend on BOARD_*_API_LEVEL if it exists" am: 9885f2f744
Original change: https://android-review.googlesource.com/c/platform/build/+/1843156
Change-Id: Ib1b20e7c1da4427c30a98d11a2729724ad176be8
| -rw-r--r-- | core/config.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk index 1ad50bef53..91659258e5 100644 --- a/core/config.mk +++ b/core/config.mk @@ -723,10 +723,13 @@ else endif .KATI_READONLY := BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES +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 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))) - endif ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),28),) ifneq ($(TARGET_IS_64_BIT), true) ifneq ($(TARGET_USES_64_BIT_BINDER), true) |