From 43b1bb5be1e43ad8d430540e395c2216ace6c2a4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 21 Jan 2011 07:59:40 -0800 Subject: [PATCH] (Re-)Set version names for AOSP master - do not merge Change-Id: I0973090ebf00a9e0deb8ec2beb0f39fa93bc03c1 --- core/build_id.mk | 2 +- core/version_defaults.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..e954794be 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -23,7 +23,7 @@ # (like "TC1-RC5"). It must be a single word, and is # capitalized by convention. # -BUILD_ID := MASTER +BUILD_ID := OPENMASTER # DISPLAY_BUILD_NUMBER should only be set for development branches, # If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8feff2b69..22c15ca62 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 := Honeycomb + 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 := Honeycomb + PLATFORM_VERSION_CODENAME := AOSP endif ifeq "" "$(DEFAULT_APP_TARGET_SDK)" -- 2.11.0