am 578a9efd: Merge "Raise API level to 23." into mnc-dev

* commit '578a9efd837896a0abcd49b5152f106fb55f4608':
  Raise API level to 23.
This commit is contained in:
Dianne Hackborn 2015-06-27 00:50:21 +00:00 committed by Android Git Automerger
commit c3db771cac
2 changed files with 6 additions and 1 deletions

View file

@ -359,6 +359,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/*)
# 23 is becoming alive!!!
$(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
# ************************************************

View file

@ -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 := 22
PLATFORM_SDK_VERSION := 23
endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)"