Revert "Consider non-shipping lunch targets to be future."
This reverts commit 27f601f5d96bb6b94233169ae8a29ea4290e6904.
Reason for revert: Droidmonitor triggered revert due to build breakage in b/348090986. Will be verifying through ABTD before submission.
Change-Id: I55e0880741e543309a7b991d49e59e4fa1f62e53
diff --git a/common/math.mk b/common/math.mk
index 829ceb5..ecee474 100644
--- a/common/math.mk
+++ b/common/math.mk
@@ -315,9 +315,8 @@
$(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)
-# 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)))
+_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)))
define _int_encode
$(if $(filter $(words x $(_INT_LIMIT_WORDS)),$(words $(wordlist 1,$(1),x $(_INT_LIMIT_WORDS)))),\
diff --git a/core/product_config.mk b/core/product_config.mk
index c73a56e..f21c1c4 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -426,10 +426,6 @@
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)', \