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

Commit 87fa865b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev 

* commit '374712c5':
  Move up to API 21, Lollipop MR1.
parents 7e771594 374712c5

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -302,6 +302,11 @@ $(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/*)



# API 22!

$(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
@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" 
  # which is the version that we reveal to the end user.

  # Update this value when the platform version changes (rather

  # than overriding it somewhere else).  Can be an arbitrary string.

  PLATFORM_VERSION := 5.0

  PLATFORM_VERSION := LollipopMR1

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -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 := 21

  PLATFORM_SDK_VERSION := 22

endif



ifeq "" "$(PLATFORM_VERSION_CODENAME)"