diff options
| author | Ed Heyl <ed@google.com> | 2011-09-15 06:49:04 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-09-15 06:49:04 -0700 |
| commit | 58dcc788b95c38e3c6829d024f3e43f99391a1cf (patch) | |
| tree | 67c0f6ca1085ca7c1a6658551b7af35367778d46 /core | |
| parent | b8fe43be2846818c38ab237d00db38c246d7f2ec (diff) | |
| parent | 4d7ddab160ba29247225e11c2092dcfd68bd6baf (diff) | |
| download | build-58dcc788b95c38e3c6829d024f3e43f99391a1cf.zip build-58dcc788b95c38e3c6829d024f3e43f99391a1cf.tar.gz build-58dcc788b95c38e3c6829d024f3e43f99391a1cf.tar.bz2 | |
Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryrom
Diffstat (limited to 'core')
| -rw-r--r-- | core/version_defaults.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 986dac9..15176b9 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 := IceCreamSandwich + PLATFORM_VERSION := 4.0 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 := 13 + PLATFORM_SDK_VERSION := 14 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 := IceCreamSandwich + PLATFORM_VERSION_CODENAME := REL endif ifeq "" "$(DEFAULT_APP_TARGET_SDK)" |