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

Commit 915b5f4e authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Consider non-shipping lunch targets to be future." into main am: ca5e5d6f 

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



Change-Id: Ib0b01b7f064098ba788c663a50d8145c164413b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 940b212d ca5e5d6f

common/math.mk

+3 −2
Original line number Diff line number Diff line
@@ -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)))),\

core/product_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -405,6 +405,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)', \