diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-17 17:19:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 17:19:57 +0000 |
| commit | 87fa865bea0140b49b5f46e20c64d252e8b91adf (patch) | |
| tree | 83c6938595ad146d17a3ad475d3ac213925a3ba9 | |
| parent | 7e771594ce62b3d869e90831a24fa5a8956525cc (diff) | |
| parent | 374712c54f5416e14523eec15456bb8b4372ffac (diff) | |
| download | build-87fa865bea0140b49b5f46e20c64d252e8b91adf.zip build-87fa865bea0140b49b5f46e20c64d252e8b91adf.tar.gz build-87fa865bea0140b49b5f46e20c64d252e8b91adf.tar.bz2 | |
am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
* commit '374712c54f5416e14523eec15456bb8b4372ffac':
Move up to API 21, Lollipop MR1.
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 07b3ece..687712a 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8cb8d26..1acc320 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 := 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)" |