am efba0b98: It\'s beginning to look a lot like release time!

Merge commit 'efba0b9829ae375a7d7e2093dee707b79f1b8951' into froyo-plus-aosp

* commit 'efba0b9829ae375a7d7e2093dee707b79f1b8951':
  It's beginning to look a lot like release time!
This commit is contained in:
Dianne Hackborn 2010-04-06 12:58:50 -07:00 committed by Android Git Automerger
commit a98976b7c9

View file

@ -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 := Froyo
PLATFORM_VERSION := 2.2
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@ -53,13 +53,13 @@ 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 := 7
PLATFORM_SDK_VERSION := 8
endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# 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".
PLATFORM_VERSION_CODENAME := Froyo
PLATFORM_VERSION_CODENAME := REL
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"