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

Commit 0c651756 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Update to reflect KKWT's graduation to API 20." into lmp-preview-dev

parents 887cd0c7 997b896e

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -255,6 +255,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# Switching PRODUCT_RUNTIMES default for some devices

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# KKWT has become API 20

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/version_defaults.mk

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" 
  # intermediate builds).  During development, this number remains at the

  # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds

  # the code-name of the new development work.

  PLATFORM_SDK_VERSION := 19

  PLATFORM_SDK_VERSION := 20

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"
@@ -64,7 +64,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" 
  # This is all of the development codenames that are active.  Should be either

  # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional

  # codenames after PLATFORM_VERSION_CODENAME.

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),KKWT

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)

endif



ifeq "" "$(DEFAULT_APP_TARGET_SDK)"