openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 3bad5540: Here lies JB MR2: In with a whimper, out with a bang. 

* commit '3bad5540018f191ce61ce8c8df4e096275044d14':
  Here lies JB MR2: In with a whimper, out with a bang.
This commit is contained in:
Dianne Hackborn 2013-04-23 03:51:38 -07:00 committed by Android Git Automerger
parent 9d53a1d609 3bad554001
commit 6007ddadc9
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CleanSpec.mk
View File

@ -168,6 +168,19 @@ $(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)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
# So... funny story. Recall when I mentioned above the
# "JB MR2" thing? I didn't mean that. In fact, while I was
# writing JB MR, my head was thinking 4.2, and things got
# cross-wired as they are wont to do, and we ended up with
# JB MR2, which didn't actually exist.
#
# Well, didn't exist then.
#
# Now it does. Say hi, JB MR2!
$(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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

6
core/version_defaults.mk
View File

@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
# which is the version that we reveal to the end user. # which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather # Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string. # than overriding it somewhere else). Can be an arbitrary string.
PLATFORM_VERSION := JellyBeanMR2 PLATFORM_VERSION := 4.3
endif endif
ifeq "" "$(PLATFORM_SDK_VERSION)" ifeq "" "$(PLATFORM_SDK_VERSION)"
@ -53,13 +53,13 @@ ifeq "" "$(PLATFORM_SDK_VERSION)"
# intermediate builds). During development, this number remains at the # intermediate builds). During development, this number remains at the
# SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
# the code-name of the new development work. # the code-name of the new development work.
PLATFORM_SDK_VERSION := 17 PLATFORM_SDK_VERSION := 18
endif endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)" ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is the current development code-name, if the build is not a final # This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL". # release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME := JellyBeanMR2 PLATFORM_VERSION_CODENAME := REL
endif endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)" ifeq "" "$(DEFAULT_APP_TARGET_SDK)"