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

Commit 18e00647 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-5.1.1_r1' of https://android.googlesource.com/platform/build into cm-12.1 

Android 5.1.1 release 1
parents c599dca5 a9c8e589

CleanSpec.mk

+5 −0
Original line number Diff line number Diff line
@@ -309,6 +309,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.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/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=LMY47O
 
export BUILD_ID=LMY47V

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 := 5.1

  PLATFORM_VERSION := 5.1.1

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"