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

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

am 0421d0b1: Fix issue #18368417: 5.0 -> 5.1. 

* commit '0421d0b1':
  Fix issue #18368417: 5.0 -> 5.1.
parents c2b74b87 0421d0b1

CleanSpec.mk

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



# 5.1!

$(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

+1 −1
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 := LollipopMR1

  PLATFORM_VERSION := 5.1

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"