From 4b41e8db14b9049faa9ce189b73b7a5eeb3b6f4b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 7 Nov 2014 13:56:45 -0800 Subject: [PATCH 01/12] "LRX21R" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f404c81d57..43630d1d3e 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=LRX21Q +export BUILD_ID=LRX21R From 3676c2f1de679e753bb7e5fe28e359c6782df880 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 7 Nov 2014 17:40:50 -0800 Subject: [PATCH 02/12] "LRX21S" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 43630d1d3e..59a495ec48 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=LRX21R +export BUILD_ID=LRX21S From 14bb1521d72eb543c81aa65d55b0504070959c4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Nov 2014 11:06:55 -0800 Subject: [PATCH 03/12] "LRX21T" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 59a495ec48..73a331326e 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=LRX21S +export BUILD_ID=LRX21T From 28b7b1befbcb03015dd965eba63d2d87d98e5deb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Nov 2014 14:28:02 -0800 Subject: [PATCH 04/12] "LRX21U" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 73a331326e..2d6431919a 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=LRX21T +export BUILD_ID=LRX21U From fd84336c3fcd306a7d1fca6f7d23a85310a33d82 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Nov 2014 11:51:39 -0800 Subject: [PATCH 05/12] "LRX21V" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2d6431919a..cf00cee06a 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=LRX21U +export BUILD_ID=LRX21V From 988ef2c5759b2d52e1cac3b7430e78cbcc872eda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Nov 2014 15:45:03 -0800 Subject: [PATCH 06/12] "LRX21W" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cf00cee06a..35e2b1f836 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=LRX21V +export BUILD_ID=LRX21W From 30de1b624d459d68b57543c026113c25252ccdb9 Mon Sep 17 00:00:00 2001 From: Dave Langemak Date: Mon, 17 Nov 2014 16:37:50 -0800 Subject: [PATCH 07/12] Increment Android versions to 5.0.1 Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74 --- CleanSpec.mk | 3 +++ core/version_defaults.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index f348692dd2..ca6617850f 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -299,6 +299,9 @@ $(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.0.1 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8cb8d26262..36e4e98fa1 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 := 5.0.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From 4eab14a6ac5d9deafef778c7bf65f72e130cb2b3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Nov 2014 10:44:44 -0800 Subject: [PATCH 08/12] "LRX21X" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 35e2b1f836..487676a81d 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=LRX21W +export BUILD_ID=LRX21X From 205c1f8aa4429f742e768199c84ab5f4877b51ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Nov 2014 10:59:42 -0800 Subject: [PATCH 09/12] "LRX21Y" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 487676a81d..d4eef641b1 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=LRX21X +export BUILD_ID=LRX21Y From ced3fdcfa3d576fc42a6a8ad2ff0114af5643255 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Nov 2014 12:04:49 -0800 Subject: [PATCH 10/12] "LRX21Z" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d4eef641b1..507b17f199 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=LRX21Y +export BUILD_ID=LRX21Z From ff8b5b19bed47660bcc6319a73b5b78d1e6dacda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Nov 2014 15:32:46 -0800 Subject: [PATCH 11/12] "LRX22B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 507b17f199..30e3f532c3 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=LRX21Z +export BUILD_ID=LRX22B From 9cc93738aeb5723e8f9d502e7ac6210c6f6d4073 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Nov 2014 15:48:58 -0800 Subject: [PATCH 12/12] "LRX22C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 30e3f532c3..146ce2a683 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=LRX22B +export BUILD_ID=LRX22C