aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-28 10:35:50 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-28 10:35:50 -0700
commitdcd11407e242e8e50d122752a5df769450ab6d8d (patch)
treed6cc98660c0aa74a05f00c2a84a3566407ff5f40
parentfe75781ee9b51bc1266f5e9d002637c53cd3c92c (diff)
parent833e62400e7ecfea3df188b99b6639708fe36963 (diff)
downloadbuild-dcd11407e242e8e50d122752a5df769450ab6d8d.tar.gz
merge from open-source master
Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0
-rw-r--r--core/version_defaults.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ec5dcd4d06..a30b7d9115 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 := 2.2
+ PLATFORM_VERSION := AOSP
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -59,7 +59,7 @@ 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 := REL
+ PLATFORM_VERSION_CODENAME := AOSP
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"