From ef378cf5909f78332fa5f332d43980d48a063468 Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Thu, 15 Sep 2011 07:00:42 -0700 Subject: [PATCH 1/4] IPK77 Change-Id: I3bc35f1705a33b34119a350b84ff54dc19a89da3 --- core/build_id.mk | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index e415e8db64..1bf67c0c7e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,32 +1,21 @@ # -# Copyright (C) 2008 The Android Open Source Project +## Copyright (C) 2008 The Android Open Source Project # -# Licensed under the Apache License, Version 2.0 (the "License"); +## Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# # You may obtain a copy of the License at +# # +# # http://www.apache.org/licenses/LICENSE-2.0 +# # +# # Unless required by applicable law or agreed to in writing, software +# # distributed under the License is distributed on an "AS IS" BASIS, +# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# # See the License for the specific language governing permissions and +# # limitations under the License. +# # +# # BUILD_ID is usually used to specify the branch name +# # (like "MAIN") or a branch name and a release candidate +# # (like "CRB01"). It must be a single word, and is +# # capitalized by convention. # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Defines branch-specific values. -# - -# BUILD_ID is usually used to specify the branch name -# (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is -# capitalized by convention. -# -BUILD_ID := ICS_FACTORYROM - -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=IPK77 From f38cdf85859a923f28c622553429b7ac38d5712e Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Thu, 15 Sep 2011 09:44:04 -0700 Subject: [PATCH 2/4] correct branch id to 'IF' Change-Id: I7fd338f355511869559cc5b407b82e77dc3425ed --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1bf67c0c7e..5751d73e5e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # # (like "CRB01"). It must be a single word, and is # # capitalized by convention. # -export BUILD_ID=IPK77 +export BUILD_ID=IFK77 From bc4abd817a96f30f23d598ea83d8faddc82a3732 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Sep 2011 14:36:27 -0700 Subject: [PATCH 3/4] IFK77B --- core/build_id.mk | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5751d73e5e..c7acfe245c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,21 +1,22 @@ + # -## Copyright (C) 2008 The Android Open Source Project +# Copyright (C) 2008 The Android Open Source Project # -## Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -# # You may obtain a copy of the License at -# # -# # http://www.apache.org/licenses/LICENSE-2.0 -# # -# # Unless required by applicable law or agreed to in writing, software -# # distributed under the License is distributed on an "AS IS" BASIS, -# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# # See the License for the specific language governing permissions and -# # limitations under the License. -# # -# # BUILD_ID is usually used to specify the branch name -# # (like "MAIN") or a branch name and a release candidate -# # (like "CRB01"). It must be a single word, and is -# # capitalized by convention. +# You may obtain a copy of the License at # -export BUILD_ID=IFK77 +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# BUILD_ID is usually used to specify the branch name +# (like "MAIN") or a branch name and a release candidate +# (like "CRB01"). It must be a single word, and is +# capitalized by convention. + +export BUILD_ID=IFK77B From 3188a56cd79ac03270dda8ea4d306451c1dbc263 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Sep 2011 17:55:40 -0700 Subject: [PATCH 4/4] IFK77C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c7acfe245c..bacd7ec5b7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=IFK77B +export BUILD_ID=IFK77C