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

Commit b5b87776 authored by Pechetty Sravani's avatar Pechetty Sravani Committed by Gerrit Code Review
Browse files

Revert "Consider non-shipping lunch targets to be future." 

This reverts commit 27f601f5.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/348090986. Will be verifying through ABTD before submission.

Change-Id: I55e0880741e543309a7b991d49e59e4fa1f62e53
parent 27f601f5

common/math.mk

+2 −3
Original line number Diff line number Diff line
@@ -315,9 +315,8 @@ $(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)



# 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)))),\

core/product_config.mk

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