Merge tag 'android-5.1.1_r1' of https://android.googlesource.com/platform/build into cm-12.1
Android 5.1.1 release 1
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6e7c9b0..e706b9c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -309,6 +309,11 @@
$(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
# ************************************************
diff --git a/core/build_id.mk b/core/build_id.mk
index 29b44b7..fa23867 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -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
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d87a032..cc63286 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
# 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)"