From 8907ad66d11986f50639c96e6ac16748a5be3187 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Thu, 20 Jun 2024 16:49:58 +0000
Subject: [PATCH] Reland "Consider non-shipping lunch targets to be future."

This reverts commit b5b87776867319314dbbb1f1512a5f5c9c18ffc1.

Reason for revert: reverted in b/348090986

Change-Id: I2cc85dc4bdf9ed3dc2fb4ff77d9dffa3c32dda76
---
 common/math.mk         | 5 +++--
 core/config.mk         | 3 ---
 core/product_config.mk | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/math.mk b/common/math.mk
index ecee474d14..829ceb5e6f 100644
--- a/common/math.mk
+++ b/common/math.mk
@@ -315,8 +315,9 @@ $(call math-expect,(call numbers_greater_or_equal_to,1,0 2 1 3),2 1 3)
 $(call math-expect,(call numbers_greater_or_equal_to,0,0 2 1 3),0 2 1 3)
 $(call math-expect,(call numbers_greater_or_equal_to,1,0 2 1 3 2),2 1 3 2)
 
-_INT_LIMIT_WORDS := $(foreach a,x x,$(foreach b,x x x x x x x x x x x x x x x x,\
-  $(foreach c,x x x x x x x x x x x x x x x x,x x x x x x x x x x x x x x x x)))
+# 10,001 = 10 ** 4 + 1, contains 10,001 x's, so 1 more than 10,000 (future) API level
+_INT_LIMIT_WORDS := x $(foreach a,0 1 2 3 4 5 6 7 8 9,$(foreach b,0 1 2 3 4 5 6 7 8 9,\
+  $(foreach c,0 1 2 3 4 5 6 7 8 9,x x x x x x x x x x)))
 
 define _int_encode
 $(if $(filter $(words x $(_INT_LIMIT_WORDS)),$(words $(wordlist 1,$(1),x $(_INT_LIMIT_WORDS)))),\
diff --git a/core/config.mk b/core/config.mk
index ce11b1d558..fa8dd606ed 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -821,9 +821,6 @@ ifdef PRODUCT_SHIPPING_API_LEVEL
   else
     min_systemsdk_version := $(PRODUCT_SHIPPING_API_LEVEL)
   endif
-  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
   ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29),)
     ifneq ($(BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE),)
       $(error When PRODUCT_SHIPPING_API_LEVEL >= 29, BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE cannot be set)
diff --git a/core/product_config.mk b/core/product_config.mk
index f21c1c4188..c73a56e42e 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -426,6 +426,10 @@ else
   TARGET_AAPT_CHARACTERISTICS := $(PRODUCT_CHARACTERISTICS)
 endif
 
+ifndef PRODUCT_SHIPPING_API_LEVEL
+  PRODUCT_SHIPPING_API_LEVEL := 10000
+endif
+
 ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
   ifneq (1,$(words $(PRODUCT_DEFAULT_DEV_CERTIFICATE)))
     $(error PRODUCT_DEFAULT_DEV_CERTIFICATE='$(PRODUCT_DEFAULT_DEV_CERTIFICATE)', \