From 1769a05b4337facc5f30e7dda292df030a7268e9 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 11 Jun 2010 01:16:41 -0700 Subject: [PATCH 001/246] fix build id Change-Id: I1bc4b8c9b5db8285309fa2d68fda80bc47f03533 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..05faac13f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# 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=GRF70 From 70e704c2fbae0f2c2d3d47edda9b13178dbdd9d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 11 Jun 2010 02:45:52 -0700 Subject: [PATCH 002/246] GRF72 Change-Id: I017ba340cff2f619ab0e1cd548170662a9a81ea1 --- 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 05faac13f..a857dcecf 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=GRF70 +export BUILD_ID=GRF72 From 66fdbdcb0f866cbff0cf2d616c29f159e5b458ff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Jun 2010 09:00:49 -0700 Subject: [PATCH 003/246] GRF78 Change-Id: I13b812538d112c23360f2106a8afb3d2590a4156 --- 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 a857dcecf..1d96b24d8 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=GRF72 +export BUILD_ID=GRF78 From 5bc06e01816786e74c75b54eb6708845a4215011 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 18 Jun 2010 08:17:16 -0700 Subject: [PATCH 004/246] GRF79 Change-Id: I4f97904cfad3690a3501294a50bd40af615ee0af --- 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 1d96b24d8..145e4758e 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=GRF78 +export BUILD_ID=GRF79 From 051cedca770aa6cf1e6f93829daaedbedede807c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Jun 2010 08:45:42 -0700 Subject: [PATCH 005/246] GRF82 Change-Id: I3da577ee1878c987981b622f38b2a93b6f05fb72 --- 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 145e4758e..1f3e9fae3 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=GRF79 +export BUILD_ID=GRF82 From e5f55c0a6395408227ce685c36e877e5e24d268b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Jun 2010 08:14:42 -0700 Subject: [PATCH 006/246] GRF83 Change-Id: I76d8f806015cec704dc53d7362e0decbc783aafc --- 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 1f3e9fae3..c3eb293f7 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=GRF82 +export BUILD_ID=GRF83 From e556264524da63686f49cbf8aa408fb8c55ffe80 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Jun 2010 08:46:24 -0700 Subject: [PATCH 007/246] GRF84 Change-Id: I6fb4f4c296cd51ac6a06cf6830a274ee491cbb40 --- 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 c3eb293f7..7dce5d523 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=GRF83 +export BUILD_ID=GRF84 From 2b02c3bbd3a3675899686c130d972259b663e981 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 Jun 2010 08:15:40 -0700 Subject: [PATCH 008/246] GRF85 Change-Id: I3301c5fe3e45f63ffdd16a4dbaedea040ab5a9c2 --- 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 7dce5d523..7cd0f6c13 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=GRF84 +export BUILD_ID=GRF85 From afe4b3f9499f4eb6de3e410a8e89c104316d8b9d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Jun 2010 08:16:08 -0700 Subject: [PATCH 009/246] GRF86 Change-Id: Icbc8dace89da08920a9d6d585899e01663858c7f --- 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 7cd0f6c13..dc83175f2 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=GRF85 +export BUILD_ID=GRF86 From c79a994eaf492a6f3d8205f212f3d7d7e4eedcb1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Jun 2010 08:18:58 -0700 Subject: [PATCH 010/246] GRF89 Change-Id: I38695a2b2072dcbe5cb479bc0a06de40de04c415 --- 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 dc83175f2..4dd3a31cb 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=GRF86 +export BUILD_ID=GRF89 From fd0f1b6c7c7f3d765049374d6822109579d79d0b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Jun 2010 08:17:15 -0700 Subject: [PATCH 011/246] GRF90 Change-Id: I1a3d96f86e688e1f280bdcd6bb9059df0526b30a --- 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 4dd3a31cb..3bd5eff7b 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=GRF89 +export BUILD_ID=GRF90 From 9f45f73090712f07360b70556705d3fe9f0d129d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Jun 2010 08:22:10 -0700 Subject: [PATCH 012/246] GRF91 Change-Id: Ib5661481431a8353adfa34ec5ee78223cd1cc576 --- 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 3bd5eff7b..394d2404f 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=GRF90 +export BUILD_ID=GRF91 From e99698b93fb9524bf0694fccadf14f8e33e139bf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Jul 2010 08:38:05 -0700 Subject: [PATCH 013/246] GRG02 Change-Id: I6017bbc4fc47a649f7b58bc45dcebe2e82a31f6d --- core/build_id.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5538b6cc0..2e5ead485 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,5 @@ # (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=GRF91 +export BUILD_ID=GRG02 From fb07423f7c9169d1e97eee41583367236da0dfc6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Jul 2010 08:10:34 -0700 Subject: [PATCH 014/246] GRG06 Change-Id: I3af337f53801388f7eef30c3516c61de96a92617 --- 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 2e5ead485..6a09a61e5 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=GRG02 +export BUILD_ID=GRG06 From 1315d146e08b4676b9290859e2d5aa11e00a70fc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 Jul 2010 08:21:14 -0700 Subject: [PATCH 015/246] GRG07 Change-Id: I139ab17d7e3a812f57c6cbc2bfd1a03673d6170e --- 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 6a09a61e5..574922736 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=GRG06 +export BUILD_ID=GRG07 From 1f31c5bcc0a26a2dea1d6c7a7337aa126aa1077c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Jul 2010 08:17:05 -0700 Subject: [PATCH 016/246] GRG08 Change-Id: Ieff66aa54f46aaed7094029d04ae4e93e6602a74 --- 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 574922736..6045ccd47 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=GRG07 +export BUILD_ID=GRG08 From c64bd058db40d0512203768f33a1b37e2a3eb66e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Jul 2010 16:20:24 -0700 Subject: [PATCH 017/246] GRG08B Change-Id: Ib033283a7cca90160750ec8a6b1f20ba48e22cdb --- 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 6045ccd47..c5592506f 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=GRG08 +export BUILD_ID=GRG08B From ba897415ca97d1722bdb1bfdc76a39448683b89d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 9 Jul 2010 08:16:47 -0700 Subject: [PATCH 018/246] GRG09 Change-Id: I5e70289cade506e739a4ef8ab91346019d45f234 --- 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 c5592506f..3ac5f59e5 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=GRG08B +export BUILD_ID=GRG09 From e13c174e5ee02c942479a97384d49a9c5a535234 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 12 Jul 2010 08:17:34 -0700 Subject: [PATCH 019/246] GRG12 Change-Id: Iaf4d1bc4106c1601189448d3e24c41316ea226fe --- 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 3ac5f59e5..2b8b28ddd 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=GRG09 +export BUILD_ID=GRG12 From 3ac81290f94daed513ae2c9d1404f93b3e44d323 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Jul 2010 08:17:36 -0700 Subject: [PATCH 020/246] GRG13 Change-Id: Ieee9e0567310b0f7fce3ecb569c0f2558927fa0b --- 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 2b8b28ddd..04b0b92d6 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=GRG12 +export BUILD_ID=GRG13 From 450f0cbc283be7a969eaf6f2818fe170ddad10e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Jul 2010 08:17:49 -0700 Subject: [PATCH 021/246] GRG14 Change-Id: I29e738e10263ab0dfbaaa633658214d7b67ee98c --- 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 04b0b92d6..29c180d27 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=GRG13 +export BUILD_ID=GRG14 From 3c199c508b22d241f82e2845c04b50cc603b3ca3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Jul 2010 16:29:50 -0700 Subject: [PATCH 022/246] GRG14B Change-Id: Ibfb3a313142fb7f2b9aecea7e9bceda0f21aeb46 --- 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 29c180d27..5c50e363e 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=GRG14 +export BUILD_ID=GRG14B From 9c1a08abfefd15458858795bb50e888e8a2380a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Jul 2010 08:44:36 -0700 Subject: [PATCH 023/246] GRG15 Change-Id: Ic51e1429819ee10647188d1444fb73960ee8e38d --- 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 5c50e363e..ebd4733ce 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=GRG14B +export BUILD_ID=GRG15 From c1bda9a1cdc86cbf865a6ec1c70edc77ab943b2b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 16 Jul 2010 08:18:59 -0700 Subject: [PATCH 024/246] GRG16 Change-Id: I39fe307b0c3938981b3507fa10d64dd6825517cb --- 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 ebd4733ce..0ce392f0e 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=GRG15 +export BUILD_ID=GRG16 From f81099263591f32a05f9eac194270f579c595610 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 19 Jul 2010 08:34:08 -0700 Subject: [PATCH 025/246] GRG19 Change-Id: I023eeabe08b60421c4fc544a1feedd2bc4f0c3f7 --- 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 0ce392f0e..3b39aaefd 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=GRG16 +export BUILD_ID=GRG19 From f37daa6f3894d44cbf6c69f5612317a51459f352 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 20 Jul 2010 09:45:18 -0700 Subject: [PATCH 026/246] GRG20 Change-Id: Ib98b9aa208b3e6a45c776b6d409413be3d33bcbb --- 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 3b39aaefd..0907ad6da 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=GRG19 +export BUILD_ID=GRG20 From bace1123ee30f611c19220ec6c858ef9235bda09 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 21 Jul 2010 08:29:37 -0700 Subject: [PATCH 027/246] GRG21 Change-Id: I2a4e7f74ea8706233ab97a4b1b9f8831eb3287da --- 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 0907ad6da..d4f998d5e 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=GRG20 +export BUILD_ID=GRG21 From 864e16e6caf74bd38f778d7c1c446e2fb7ffaa1e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 22 Jul 2010 08:28:53 -0700 Subject: [PATCH 028/246] GRG22 Change-Id: Ia8fb71ad123f8e86eeeedde7551088f692942afd --- 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 d4f998d5e..51b913e2b 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=GRG21 +export BUILD_ID=GRG22 From c172ba23c687daca3b51d06356b24678bcba9355 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 23 Jul 2010 08:25:15 -0700 Subject: [PATCH 029/246] GRG23 Change-Id: I3d75edf4263e3965ca8315ab57a3a1494f00bd44 --- 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 51b913e2b..4d657617a 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=GRG22 +export BUILD_ID=GRG23 From 3f87943505ae22aec18e095b2b203de8021d4aef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 26 Jul 2010 08:25:59 -0700 Subject: [PATCH 030/246] GRG26 Change-Id: I1e76fab59ad57e55992b25361030525e09a52197 --- 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 4d657617a..d63591795 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=GRG23 +export BUILD_ID=GRG26 From 72013ce6b8fc500a4f2a0f681f2238b0136a35dc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 27 Jul 2010 08:21:02 -0700 Subject: [PATCH 031/246] GRG27 Change-Id: I94196705935d46ec9a6d95f13c3ffd0652e66dde --- 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 d63591795..f75bfd610 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=GRG26 +export BUILD_ID=GRG27 From 0847a3ad983e3f0a977cf022ace6432a4ff34009 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 28 Jul 2010 08:26:56 -0700 Subject: [PATCH 032/246] GRG28 Change-Id: Ife1a68ba1edc1d96250a304c548a86ed498fb4e3 --- 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 f75bfd610..b1f9fa2c8 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=GRG27 +export BUILD_ID=GRG28 From 83f0a8ec28d74527b51437e2d6a2436ba4f14f9f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 29 Jul 2010 08:20:46 -0700 Subject: [PATCH 033/246] GRG29 Change-Id: Iefa8312b3fc13af4f39769ae34a75d37bbfaa6b7 --- 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 b1f9fa2c8..e6b53675e 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=GRG28 +export BUILD_ID=GRG29 From af9acb572b91c80d77fb949d6918172cbc794be5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 30 Jul 2010 08:09:47 -0700 Subject: [PATCH 034/246] GRG30 Change-Id: If5b9f8d67b42668def58f29ef5afe2b9caaf35d3 --- 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 e6b53675e..495d85340 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=GRG29 +export BUILD_ID=GRG30 From 56d31044507413aaaecc9887c13bee9b5577e965 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 2 Aug 2010 08:09:37 -0700 Subject: [PATCH 035/246] GRG33 Change-Id: I1828b5eb1ce87191ee5743e232343d80804e1e15 --- 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 495d85340..1d37008b7 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=GRG30 +export BUILD_ID=GRG33 From 55a1a4c3fbb980373799eaa84edabc93fcc92aa5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 Aug 2010 08:47:21 -0700 Subject: [PATCH 036/246] GRG34 Change-Id: I5c1405aae5555a9d899ffad9b6199bc8b337ab28 --- 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 1d37008b7..2c57b6c4f 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=GRG33 +export BUILD_ID=GRG34 From d20157f2b46808375c7bc3fce9c8be6a41efa2a5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 Aug 2010 08:23:39 -0700 Subject: [PATCH 037/246] GRG35 Change-Id: I8dd6d6ec91f778b742e7f27022b3c49eca8e7abd --- 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 2c57b6c4f..9cf60b769 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=GRG34 +export BUILD_ID=GRG35 From 03a43e67d9aecac2d0ce7b985ae9d648a31c8aae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 5 Aug 2010 08:14:40 -0700 Subject: [PATCH 038/246] GRG36 Change-Id: I5111058380f62f880fcd7bb12e7878495fcb43f4 --- 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 9cf60b769..6aee66af7 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=GRG35 +export BUILD_ID=GRG36 From 484be926ef803abdd8619894945ac2c07e0ec273 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 6 Aug 2010 08:34:34 -0700 Subject: [PATCH 039/246] GRG37 Change-Id: I094bb5a3e34399934f2c12418163c2fb31978927 --- 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 6aee66af7..5e2de5599 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=GRG36 +export BUILD_ID=GRG37 From 39b88049add7a88fd5be4ea759d84efdeb80a7e2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 9 Aug 2010 08:25:59 -0700 Subject: [PATCH 040/246] GRG40 Change-Id: Ib407701bf89abbb1771f228e2019a0f5e5fdaed2 --- 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 5e2de5599..c0c9c2d85 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=GRG37 +export BUILD_ID=GRG40 From 38903013ca8874712ebe433c6d8eb7cb949b5675 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 9 Aug 2010 14:31:39 -0700 Subject: [PATCH 041/246] Increase dexpreopt emulator respond timeout from 20s to 120s. Change-Id: I506b1752c86eb8a99ff9f1b8df277d65194ec377 --- tools/dexpreopt/dexpreopt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/dexpreopt/dexpreopt.py b/tools/dexpreopt/dexpreopt.py index 376f1359d..a8f812801 100755 --- a/tools/dexpreopt/dexpreopt.py +++ b/tools/dexpreopt/dexpreopt.py @@ -954,7 +954,7 @@ def MainInternal(): # TODO: unlink the big userdata file now, since the emulator # has it open. - if not WaitForEmulator(ep, timeout=20): Fail('Emulator did not respond') + if not WaitForEmulator(ep, timeout=120): Fail('Emulator did not respond') if not ReplaceEmulatorPrompt(ep): Fail('Could not replace prompt') dest_root = '/data/dexpreopt-root' From a73ea34c6755cf51f5f413020683d115becad5d4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 10 Aug 2010 08:25:29 -0700 Subject: [PATCH 042/246] GRG41 Change-Id: Ie993b9365832d14ddc17112a0a078e67b6a15b2c --- 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 c0c9c2d85..c3be9ebd5 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=GRG40 +export BUILD_ID=GRG41 From fc65d3535fb3aa0436e014a2db7f4d4b37d423fd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 11 Aug 2010 08:29:28 -0700 Subject: [PATCH 043/246] GRG42 Change-Id: I5aa4bfb29a37105ba2b2b85d05de4e2dcfbe83ce --- 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 c3be9ebd5..c952d9ec0 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=GRG41 +export BUILD_ID=GRG42 From 73870973e3beaab4f5cc591fdb2f68bc1f45e6f7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 12 Aug 2010 10:38:07 -0700 Subject: [PATCH 044/246] GRG43 Change-Id: I7c395c4bdf862290c499ae973c2fb96f89bf99e6 --- 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 c952d9ec0..425350b80 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=GRG42 +export BUILD_ID=GRG43 From 9f4df4b582dcd34e8ce240911b9f5d682fdd73d6 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 12 Aug 2010 17:12:05 -0700 Subject: [PATCH 045/246] GRG43B Change-Id: Iecdc3ae9b4c0993e63c597cdcba95570838dc2d3 --- 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 425350b80..eb7b85816 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=GRG43 +export BUILD_ID=GRG43B From 4ea671c831f8e258910366b0ff73b03b7fad771f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 13 Aug 2010 08:09:51 -0700 Subject: [PATCH 046/246] GRG44 Change-Id: I56e9a324f2a337dfa8d6edc5117b14948940cb9a --- 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 eb7b85816..95b4a5b36 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=GRG43B +export BUILD_ID=GRG44 From 086dfc246f4a3c75759970a8044bc72e46bd3c2c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 13 Aug 2010 12:09:00 -0700 Subject: [PATCH 047/246] GRG44B Change-Id: Ic28f85fb8fcabee95dd67f59148ce7716ee7c0d1 --- 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 95b4a5b36..805864f88 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=GRG44 +export BUILD_ID=GRG44B From 5fa163dd9ca5fa0f2adbf58250f858a55ccd2bac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 16 Aug 2010 09:21:07 -0700 Subject: [PATCH 048/246] GRG47 Change-Id: I2ddccf4bf46fe8e95cb061c694301522f782941f --- 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 805864f88..8199f4c3d 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=GRG44B +export BUILD_ID=GRG47 From 29b4c5815a3672dc145017f2272d2c1b44bea533 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 17 Aug 2010 08:36:44 -0700 Subject: [PATCH 049/246] GRG48 Change-Id: I26adfb243c07a9d4f3b3e1216f447ea951466f3e --- 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 8199f4c3d..d3514abbd 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=GRG47 +export BUILD_ID=GRG48 From 967444145fef8414e5d7eedfbc678f4f46123506 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 18 Aug 2010 08:23:26 -0700 Subject: [PATCH 050/246] GRG49 Change-Id: I7e0c3b4aadf85fada87b9e62aaa3283fdc6f42a1 --- 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 d3514abbd..22305537c 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=GRG48 +export BUILD_ID=GRG49 From e51ca33b78fb57603b22a66adc93ea006a8682d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 19 Aug 2010 08:25:34 -0700 Subject: [PATCH 051/246] GRG50 Change-Id: Ibf4afc427b9f35527f81922c7eb940aacf7a3461 --- 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 22305537c..45e2efd35 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=GRG49 +export BUILD_ID=GRG50 From 1eef0385988053a416981500f2126165e614adfa Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 19 Aug 2010 12:17:21 -0700 Subject: [PATCH 052/246] GRG50B Change-Id: I450952b5c25386c5471d07fc257aa7b7d8795ad7 --- 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 45e2efd35..17fa39e54 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=GRG50 +export BUILD_ID=GRG50B From 1c5de3b10a78dfce66fad3df7470bf7924d250ad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 19 Aug 2010 12:42:40 -0700 Subject: [PATCH 053/246] GRG50C Change-Id: I4dfd55a12acc8c3622cbc6bd342aa8d0419a2620 --- 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 17fa39e54..16e97bc53 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=GRG50B +export BUILD_ID=GRG50C From 90e493c4132653f390337636fc4fc49063ae014c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 Aug 2010 08:23:19 -0700 Subject: [PATCH 054/246] GRG51 Change-Id: If2f0becf2f57d2de2ec52a5674916d6bf932f04e --- 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 16e97bc53..fb504adf5 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=GRG50C +export BUILD_ID=GRG51 From b9c386a8d96936d1719cc4b38a743e30d3c321ef Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 20 Aug 2010 16:41:19 -0700 Subject: [PATCH 055/246] GRG51B Change-Id: I7d5e2cedb782f7724c6f3f6f2b00c31acd2b8a40 --- 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 fb504adf5..4faf0f649 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=GRG51 +export BUILD_ID=GRG51B From 08ebd950f8f3c4d09a326e406b3dff8d7657cc56 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 23 Aug 2010 08:27:13 -0700 Subject: [PATCH 056/246] GRG54 Change-Id: Ib4fce55f01604ce9d2b4cb27871e11016cde3c1d --- 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 4faf0f649..f6cf853a9 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=GRG51B +export BUILD_ID=GRG54 From c666a556857854fdbcba9043b5969505292618dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 Aug 2010 08:35:51 -0700 Subject: [PATCH 057/246] GRG55 Change-Id: I06a33c32e7010f996563a4f20cde861603ccdfcc --- 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 f6cf853a9..b8510c7b2 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=GRG54 +export BUILD_ID=GRG55 From bac7845e6e83a0548a9aa38d70a8ee0d621bed25 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Aug 2010 08:28:11 -0700 Subject: [PATCH 058/246] GRG56 Change-Id: Id8501ebc328f461ae8427553cfd0b46dac725c19 --- 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 b8510c7b2..5fa93a82b 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=GRG55 +export BUILD_ID=GRG56 From 8a74c8fab14cdce6262802b1b8eec0192fcda65a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Aug 2010 08:14:37 -0700 Subject: [PATCH 059/246] GRG57 Change-Id: I7d63a557424a0b8251cd065132e92cedd369eb8d --- 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 5fa93a82b..bd27783e9 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=GRG56 +export BUILD_ID=GRG57 From 590266d13bb00d52645dcde6a2330bc13b1979f4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Aug 2010 12:19:47 -0700 Subject: [PATCH 060/246] GRG57B Change-Id: Ib88b2b8981481bf84d57d4211a6610aeb8382d60 --- 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 bd27783e9..5dfdfd646 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=GRG57 +export BUILD_ID=GRG57B From e3f5f1c85aa74adc76446bb8cdb7c8f75517b1f0 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 26 Aug 2010 21:32:22 -0700 Subject: [PATCH 061/246] GRG57C Change-Id: Ie77bb3fcbebf3c4c268f05d03c14a9db6c3650db --- 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 5dfdfd646..93b6da7f6 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=GRG57B +export BUILD_ID=GRG57C From 37b0e02d583f3e97e37bb6590e7124dd9bda546b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 30 Aug 2010 09:02:29 -0700 Subject: [PATCH 062/246] GRG61 Change-Id: I682d0e6c134492aa73fd9da9d249fba968a468d8 --- 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 93b6da7f6..4a69513e4 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=GRG57C +export BUILD_ID=GRG61 From f1434e9a8b871f5a6dd2dabc60b225dac11f927a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 31 Aug 2010 08:16:02 -0700 Subject: [PATCH 063/246] GRG62 Change-Id: I22bc8166b5537c4bde381f0b9954073b89e666b9 --- 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 4a69513e4..d2215e5f2 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=GRG61 +export BUILD_ID=GRG62 From fc8fb95ba3978daeab3b4c6c27e792e2054be481 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 31 Aug 2010 16:05:29 -0700 Subject: [PATCH 064/246] GRG62B Change-Id: I26f083d424825f404cbfdccbad9de3c56b38a4de --- 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 d2215e5f2..d15b425f0 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=GRG62 +export BUILD_ID=GRG62B From 0a1c138bb75aaf3db5579979b76e491c58e2b25d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Sep 2010 08:32:30 -0700 Subject: [PATCH 065/246] GRG63 Change-Id: I596953b9a37c8da86e21527a350d1d14cbff0e24 --- 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 d15b425f0..08be00d50 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=GRG62B +export BUILD_ID=GRG63 From 72988bc26730e4cc17a0dfd6f89a4609a8229efb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Sep 2010 19:50:25 -0700 Subject: [PATCH 066/246] GRG63B Change-Id: If3b8c5989cb652d9edabe68abe25e125c25c6529 --- 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 08be00d50..15a4ef9b1 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=GRG63 +export BUILD_ID=GRG63B From d55f498d51c9574c648f67a33a7aa8aed980ffdb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Sep 2010 08:39:48 -0700 Subject: [PATCH 067/246] GRG64 Change-Id: If3edb604f34d478f5a91f597a7e43e3e2cfa8f71 --- 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 15a4ef9b1..00bd9dec5 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=GRG63B +export BUILD_ID=GRG64 From e339d7b124b7faa81a762daf00de5c51da7f3ffe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Sep 2010 15:29:26 -0700 Subject: [PATCH 068/246] GRG64B Change-Id: I765a1b26075e9c9d0432ac5e5379fc239a5d2396 --- 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 00bd9dec5..c5dc53ff2 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=GRG64 +export BUILD_ID=GRG64B From 42402aeccf11404156d3b2e574a43e5baab39747 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Sep 2010 16:03:38 -0700 Subject: [PATCH 069/246] GRG65 Change-Id: I122bf81b82a13c41b7481293115bf863bfd04f2e --- 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 c5dc53ff2..df28ec5ac 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=GRG64B +export BUILD_ID=GRG65 From f726846501421a2dbc029b2785083d4c96b85945 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Sep 2010 09:09:46 -0700 Subject: [PATCH 070/246] GRG69 Change-Id: I2c59e5ad26a950dc594855b9b39a1cceeef529d2 --- 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 df28ec5ac..225da8b62 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=GRG65 +export BUILD_ID=GRG69 From adc33ffde5a2cff1ef6f9b96a23d22f4d75387a6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Sep 2010 08:27:31 -0700 Subject: [PATCH 071/246] GRG70 Change-Id: Ieea6eabc7d1384b008562a401ed4805cd20571fe --- 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 225da8b62..c3d7c7706 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=GRG69 +export BUILD_ID=GRG70 From 9ec89f15e2d55f0da5cd85823a9372fbaaa2d632 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Wed, 8 Sep 2010 10:39:38 -0700 Subject: [PATCH 072/246] GRG70B Change-Id: I0559a4aee3908e18e4c5b93c7fe425b151c856f9 --- 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 c3d7c7706..043089eac 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=GRG70 +export BUILD_ID=GRG70B From c60d8aa01219431a256ff78adb1aeb93e482403a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Sep 2010 18:08:45 -0700 Subject: [PATCH 073/246] GRG70C Change-Id: I0faf4de601ea74f4aa3a214c3436feb805f17613 --- 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 043089eac..a6647ee3a 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=GRG70B +export BUILD_ID=GRG70C From dd6c8a1a65be4b99fa5add037f053635266f2e2d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Sep 2010 08:12:04 -0700 Subject: [PATCH 074/246] GRG71 Change-Id: I8ebd2debe2ec76711adfb508144570a9c423cfd2 --- 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 a6647ee3a..2eba3ded1 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=GRG70C +export BUILD_ID=GRG71 From a9760ce6390cd00565824360d5c2609ce7db33b3 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 10 Sep 2010 11:33:05 -0700 Subject: [PATCH 075/246] GRG71B Change-Id: I2810dc66c1616a444767ee118f5c2ccc43a8b8ab --- 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 2eba3ded1..8f153422a 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=GRG71 +export BUILD_ID=GRG71B From f58baba05dcdb5c854c79c78cc755e92bc09931b Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 10 Sep 2010 14:49:42 -0700 Subject: [PATCH 076/246] GRG71C Change-Id: Ifb2367cf59f94002fdc6b6628704c21f9fda63a6 --- 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 8f153422a..b0b916740 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=GRG71B +export BUILD_ID=GRG71C From 5d26c35afdb5807380886f7dd88c27e4608f21a2 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 10 Sep 2010 17:31:19 -0700 Subject: [PATCH 077/246] GRG71D Change-Id: Ibfa9909ddeaa880ccfc0705e4f19549aba398fc9 --- 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 b0b916740..bb4199907 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=GRG71C +export BUILD_ID=GRG71D From 67a25566470935f7a51140478e552cc0fc399b54 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Sep 2010 07:50:27 -0700 Subject: [PATCH 078/246] GRG75 Change-Id: Ifebbd36f6e452eec843f2b2ec95fc794ebaaab59 --- 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 bb4199907..a03ed43c3 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=GRG71D +export BUILD_ID=GRG75 From 912599c454bd1ab639369d9b91ee9e7dfa05a19b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Sep 2010 08:25:05 -0700 Subject: [PATCH 079/246] GRG76 Change-Id: I80d0a24959e1295d84c311ad7c17810d9147cc1d --- 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 a03ed43c3..8c9872456 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=GRG75 +export BUILD_ID=GRG76 From c22f176fb2a52c2417b03820a955f8f6e3e5fe98 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Sep 2010 07:11:47 -0700 Subject: [PATCH 080/246] GRG77 Change-Id: Ib1f767a38c3d88151851bb7e1d1c7c79114b68ac --- 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 8c9872456..ca565086c 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=GRG76 +export BUILD_ID=GRG77 From 98d5069d6a992440ec77b221eeb57ad2b75279f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Sep 2010 09:40:21 -0700 Subject: [PATCH 081/246] GRG78 Change-Id: Ib730c4936b7191a85f94fba0d95e0f5387813661 --- 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 ca565086c..a94bbc05b 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=GRG77 +export BUILD_ID=GRG78 From 36d890201a1f9c8323e1ee9c76cbd346887ac909 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Sep 2010 13:28:51 -0700 Subject: [PATCH 082/246] GRG78B Change-Id: I582a27e2e25729b21e14526c680a2e9da49e2579 --- 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 a94bbc05b..900a0f2ed 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=GRG78 +export BUILD_ID=GRG78B From f573693f1b80675c4c1fa64098da30cf6addfe4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Sep 2010 13:58:03 -0700 Subject: [PATCH 083/246] GRG78C Change-Id: If525e86642e16584ef0623b6176af5cef1511a03 --- 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 900a0f2ed..e556f9c57 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=GRG78B +export BUILD_ID=GRG78C From 6a4f7276768dcb3d24d5bf44e74e0ad48358d9d9 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 16 Sep 2010 16:01:49 -0700 Subject: [PATCH 084/246] GRG78D Change-Id: I46a8daee48bb951f7b884a74b787beffa7846e5f --- 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 e556f9c57..8a7de8166 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=GRG78C +export BUILD_ID=GRG78D From 3ec90136be3a6e8c9e81239742fd4bfceaa0f21d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Sep 2010 17:17:55 -0700 Subject: [PATCH 085/246] GRG79 Change-Id: I7fbc3ed3bcacc6f83088d181e695c90531c77272 --- 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 8a7de8166..b984974ce 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=GRG78D +export BUILD_ID=GRG79 From f13876fd6e14b42ddf165fd022bb9f9e2bf469c2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Sep 2010 17:28:21 -0700 Subject: [PATCH 086/246] GRG79B Change-Id: Ie951dc733117fe9f8a02d0f5d6f91e0cc062c3da --- 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 b984974ce..edeca5195 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=GRG79 +export BUILD_ID=GRG79B From 4845ff41806d397d671a8d21508497a42393559f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Sep 2010 07:47:53 -0700 Subject: [PATCH 087/246] GRG82 Change-Id: Icfaf82d5f9f0d660d28b8de725480e1e7ef1bc93 --- 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 edeca5195..fbc178e2c 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=GRG79B +export BUILD_ID=GRG82 From d7592f8a604c4043b9f16edaafcf3fa93df58c48 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Sep 2010 07:11:59 -0700 Subject: [PATCH 088/246] GRG83 Change-Id: I0069e316cea6795c3999ff6d2c9328c63a8b5df9 --- 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 fbc178e2c..4375451fe 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=GRG82 +export BUILD_ID=GRG83 From fc42495ce21a478e0a6de19ebb74eb16cd890f96 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Sep 2010 07:13:24 -0700 Subject: [PATCH 089/246] GRG84 Change-Id: I6869f63b081b514879c663a425f20a082a0d8622 --- 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 4375451fe..485596f35 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=GRG83 +export BUILD_ID=GRG84 From 5ee2edf61fdfaf80e19df435b6951b76d711d67c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Sep 2010 07:14:38 -0700 Subject: [PATCH 090/246] GRG85 Change-Id: Iad3f5d49402467823e18baac1a87de93dc778c12 --- 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 485596f35..644fbc537 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=GRG84 +export BUILD_ID=GRG85 From d297ce4e6960de3bd4147a6788aaddc4926a7177 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 23 Sep 2010 12:18:12 -0700 Subject: [PATCH 091/246] GRG85B Change-Id: I0416fae1b3c7c808054793485d19a467e42114eb --- 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 644fbc537..0a1fe42ab 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=GRG85 +export BUILD_ID=GRG85B From a8c37ca7b44106f0d280292627a4af7ee4b09235 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 Sep 2010 12:49:34 -0700 Subject: [PATCH 092/246] GRG88 Change-Id: I6bc2d49c5836caea679fd15f9dabd496768f25b5 --- 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 0a1fe42ab..46002950d 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=GRG85B +export BUILD_ID=GRG88 From f64c8eed7e4690a2a77050aeac8867c22df9d124 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Sun, 26 Sep 2010 13:11:16 -0700 Subject: [PATCH 093/246] Remove emulator-based dexpreopt code Now dexpreopt is done on the host side. Change-Id: I4a452daefe6f6aaae296a93d10984382336e483c --- tools/dexpreopt/Android.mk | 38 - tools/dexpreopt/Config.mk | 153 --- tools/dexpreopt/afar/Android.mk | 29 - tools/dexpreopt/afar/main.c | 247 ----- tools/dexpreopt/dexopt-wrapper/Android.mk | 36 - .../dexopt-wrapper/DexOptWrapper.cpp | 173 --- tools/dexpreopt/dexpreopt.py | 986 ------------------ tools/dexpreopt/geninitrc.awk | 62 -- 8 files changed, 1724 deletions(-) delete mode 100644 tools/dexpreopt/Android.mk delete mode 100644 tools/dexpreopt/Config.mk delete mode 100644 tools/dexpreopt/afar/Android.mk delete mode 100644 tools/dexpreopt/afar/main.c delete mode 100644 tools/dexpreopt/dexopt-wrapper/Android.mk delete mode 100644 tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp delete mode 100755 tools/dexpreopt/dexpreopt.py delete mode 100644 tools/dexpreopt/geninitrc.awk diff --git a/tools/dexpreopt/Android.mk b/tools/dexpreopt/Android.mk deleted file mode 100644 index 40aeee2e3..000000000 --- a/tools/dexpreopt/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# -ifneq ($(TARGET_SIMULATOR),true) -ifneq ($(DISABLE_DEXPREOPT),true) - -LOCAL_PATH := $(my-dir) -include $(CLEAR_VARS) -LOCAL_PREBUILT_EXECUTABLES := dexpreopt.py -include $(BUILD_SYSTEM)/host_prebuilt.mk -DEXPREOPT := $(LOCAL_INSTALLED_MODULE) - -# The script uses some other tools; make sure that they're -# installed along with it. -tools := \ - emulator$(HOST_EXECUTABLE_SUFFIX) - -$(DEXPREOPT): | $(addprefix $(HOST_OUT_EXECUTABLES)/,$(tools)) - -subdir_makefiles := \ - $(LOCAL_PATH)/dexopt-wrapper/Android.mk \ - $(LOCAL_PATH)/afar/Android.mk -include $(subdir_makefiles) - -endif # !disable_dexpreopt -endif # !sim diff --git a/tools/dexpreopt/Config.mk b/tools/dexpreopt/Config.mk deleted file mode 100644 index b2b32c6a4..000000000 --- a/tools/dexpreopt/Config.mk +++ /dev/null @@ -1,153 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -# -# Included by config/Makefile. -# Defines the pieces necessary for the dexpreopt process. -# -# inputs: INSTALLED_RAMDISK_TARGET, BUILT_SYSTEMIMAGE_UNOPT -# outputs: BUILT_SYSTEMIMAGE, SYSTEMIMAGE_SOURCE_DIR -# -LOCAL_PATH := $(my-dir) - -# TODO: see if we can make the .odex files not be product-specific. -# They can't be completely common, though, because their format -# depends on the architecture of the target system; ARM and x86 -# would have different versions. -intermediates := \ - $(call intermediates-dir-for,PACKAGING,dexpreopt) -dexpreopt_system_dir := $(intermediates)/system -built_afar := $(call intermediates-dir-for,EXECUTABLES,afar)/afar -built_dowrapper := \ - $(call intermediates-dir-for,EXECUTABLES,dexopt-wrapper)/dexopt-wrapper - -# Generate a stripped-down init.rc based on the real one. -dexpreopt_initrc := $(intermediates)/etc/init.rc -geninitrc_script := $(LOCAL_PATH)/geninitrc.awk -$(dexpreopt_initrc): script := $(geninitrc_script) -$(dexpreopt_initrc): system/core/rootdir/init.rc $(geninitrc_script) - @echo "Dexpreopt init.rc: $@" - @mkdir -p $(dir $@) - $(hide) awk -f $(script) < $< > $@ - -BUILT_DEXPREOPT_RAMDISK := $(intermediates)/ramdisk.img -$(BUILT_DEXPREOPT_RAMDISK): intermediates := $(intermediates) -$(BUILT_DEXPREOPT_RAMDISK): dexpreopt_root_out := $(intermediates)/root -$(BUILT_DEXPREOPT_RAMDISK): dexpreopt_initrc := $(dexpreopt_initrc) -$(BUILT_DEXPREOPT_RAMDISK): built_afar := $(built_afar) -$(BUILT_DEXPREOPT_RAMDISK): built_dowrapper := $(built_dowrapper) -$(BUILT_DEXPREOPT_RAMDISK): \ - $(INSTALLED_RAMDISK_TARGET) \ - $(dexpreopt_initrc) \ - $(built_afar) \ - $(built_dowrapper) \ - | $(MKBOOTFS) $(ACP) -$(BUILT_DEXPREOPT_RAMDISK): - @echo "Dexpreopt ramdisk: $@" - $(hide) rm -f $@ - $(hide) rm -rf $(dexpreopt_root_out) - $(hide) mkdir -p $(dexpreopt_root_out) - $(hide) $(ACP) -rd $(TARGET_ROOT_OUT) $(intermediates) - $(hide) $(ACP) -f $(dexpreopt_initrc) $(dexpreopt_root_out)/ - $(hide) $(ACP) $(built_afar) $(dexpreopt_root_out)/sbin/ - $(hide) $(ACP) $(built_dowrapper) $(dexpreopt_root_out)/sbin/ - $(MKBOOTFS) $(dexpreopt_root_out) | gzip > $@ - -sign_dexpreopt := true -ifdef sign_dexpreopt - # Such a huge hack. We need to re-sign the .apks with the - # same certs that they were originally signed with. - dexpreopt_package_certs_file := $(intermediates)/package-certs - $(shell mkdir -p $(intermediates)) - $(shell rm -f $(dexpreopt_package_certs_file)) - $(foreach p,$(PACKAGES),\ - $(shell echo "$(p) $(PACKAGES.$(p).CERTIFICATE) $(PACKAGES.$(p).PRIVATE_KEY)" >> $(dexpreopt_package_certs_file))) -endif - -# The kernel used for ARMv7 system images is different -ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) -BUILD_DEXPREOPT_KERNEL := prebuilt/android-arm/kernel/kernel-qemu-armv7 -else -BUILD_DEXPREOPT_KERNEL := prebuilt/android-arm/kernel/kernel-qemu -endif - -# Build an optimized image from the unoptimized image -BUILT_DEXPREOPT_SYSTEMIMAGE := $(intermediates)/system.img -$(BUILT_DEXPREOPT_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE_UNOPT) -$(BUILT_DEXPREOPT_SYSTEMIMAGE): $(BUILT_DEXPREOPT_RAMDISK) -$(BUILT_DEXPREOPT_SYSTEMIMAGE): | $(DEXPREOPT) $(ACP) $(ZIPALIGN) -$(BUILT_DEXPREOPT_SYSTEMIMAGE): SYSTEM_DIR := $(dexpreopt_system_dir) -$(BUILT_DEXPREOPT_SYSTEMIMAGE): DEXPREOPT_TMP := $(intermediates)/emutmp -ifdef sign_dexpreopt -$(BUILT_DEXPREOPT_SYSTEMIMAGE): | $(SIGNAPK_JAR) -endif -$(BUILT_DEXPREOPT_SYSTEMIMAGE): - @rm -f $@ - @echo "dexpreopt: copy system to $(SYSTEM_DIR)" - @rm -rf $(SYSTEM_DIR) - @mkdir -p $(dir $(SYSTEM_DIR)) - $(hide) $(ACP) -rd $(TARGET_OUT) $(SYSTEM_DIR) - @echo "dexpreopt: optimize dex files" - @rm -rf $(DEXPREOPT_TMP) - @mkdir -p $(DEXPREOPT_TMP) - $(hide) \ - PATH=$(HOST_OUT_EXECUTABLES):$$PATH \ - $(DEXPREOPT) \ - --kernel $(BUILD_DEXPREOPT_KERNEL) \ - --ramdisk $(BUILT_DEXPREOPT_RAMDISK) \ - --image $(BUILT_SYSTEMIMAGE_UNOPT) \ - --system $(PRODUCT_OUT) \ - --tmpdir $(DEXPREOPT_TMP) \ - --outsystemdir $(SYSTEM_DIR) -ifdef sign_dexpreopt - @echo "dexpreopt: re-sign apk files" - $(hide) \ - export PATH=$(HOST_OUT_EXECUTABLES):$$PATH; \ - for apk in $(SYSTEM_DIR)/app/*.apk; do \ - packageName=`basename $$apk`; \ - packageName=`echo $$packageName | sed -e 's/.apk$$//'`; \ - cert=`grep "^$$packageName " $(dexpreopt_package_certs_file) | \ - awk '{print $$2}'`; \ - pkey=`grep "^$$packageName " $(dexpreopt_package_certs_file) | \ - awk '{print $$3}'`; \ - if [ "$$cert" -a "$$pkey" ]; then \ - echo "dexpreopt: re-sign app/"$$packageName".apk"; \ - tmpApk=$$apk~; \ - rm -f $$tmpApk; \ - java -jar $(SIGNAPK_JAR) $$cert $$pkey $$apk $$tmpApk || \ - exit 11; \ - mv -f $$tmpApk $$apk; \ - else \ - echo "dexpreopt: no keys for app/"$$packageName".apk"; \ - rm $(SYSTEM_DIR)/app/$$packageName.* && \ - cp $(TARGET_OUT)/app/$$packageName.apk \ - $(SYSTEM_DIR)/app || exit 12; \ - fi; \ - tmpApk=$$apk~; \ - rm -f $$tmpApk; \ - $(ZIPALIGN) -f 4 $$apk $$tmpApk || exit 13; \ - mv -f $$tmpApk $$apk; \ - done -endif - @echo "Dexpreopt system image: $@" - $(hide) $(MKYAFFS2) -f $(SYSTEM_DIR) $@ - -.PHONY: dexpreoptimage -dexpreoptimage: $(BUILT_DEXPREOPT_SYSTEMIMAGE) - -# Tell our caller to use the optimized systemimage -BUILT_SYSTEMIMAGE := $(BUILT_DEXPREOPT_SYSTEMIMAGE) -SYSTEMIMAGE_SOURCE_DIR := $(dexpreopt_system_dir) diff --git a/tools/dexpreopt/afar/Android.mk b/tools/dexpreopt/afar/Android.mk deleted file mode 100644 index 9f1b987ac..000000000 --- a/tools/dexpreopt/afar/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# -LOCAL_PATH := $(my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - main.c - -# Just for adler32() -LOCAL_C_INCLUDES := external/zlib -LOCAL_SHARED_LIBRARIES := libz - -LOCAL_MODULE := afar -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) diff --git a/tools/dexpreopt/afar/main.c b/tools/dexpreopt/afar/main.c deleted file mode 100644 index d66d59c8c..000000000 --- a/tools/dexpreopt/afar/main.c +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * 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. - */ - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -#include // for adler32() - -static int verbose = 0; - -/* - * Android File Archive format: - * - * magic[5]: 'A' 'F' 'A' 'R' '\n' - * version[4]: 0x00 0x00 0x00 0x01 - * for each file: - * file magic[4]: 'F' 'I' 'L' 'E' - * namelen[4]: Length of file name, including NUL byte (big-endian) - * name[*]: NUL-terminated file name - * datalen[4]: Length of file (big-endian) - * data[*]: Unencoded file data - * adler32[4]: adler32 of the unencoded file data (big-endian) - * file end magic[4]: 'f' 'i' 'l' 'e' - * end magic[4]: 'E' 'N' 'D' 0x00 - * - * This format is about as simple as possible; it was designed to - * make it easier to transfer multiple files over an stdin/stdout - * pipe to another process, so word-alignment wasn't necessary. - */ - -static void -die(const char *why, ...) -{ - va_list ap; - - va_start(ap, why); - fprintf(stderr, "error: "); - vfprintf(stderr, why, ap); - fprintf(stderr, "\n"); - va_end(ap); - exit(1); -} - -static void -write_big_endian(size_t v) -{ - putchar((v >> 24) & 0xff); - putchar((v >> 16) & 0xff); - putchar((v >> 8) & 0xff); - putchar( v & 0xff); -} - -static void -_eject(struct stat *s, char *out, int olen, char *data, size_t datasize) -{ - unsigned long adler; - - /* File magic. - */ - printf("FILE"); - - /* Name length includes the NUL byte. - */ - write_big_endian(olen + 1); - - /* File name and terminating NUL. - */ - printf("%s", out); - putchar('\0'); - - /* File length. - */ - write_big_endian(datasize); - - /* File data. - */ - if (fwrite(data, 1, datasize, stdout) != datasize) { - die("Error writing file data"); - } - - /* Checksum. - */ - adler = adler32(0, NULL, 0); - adler = adler32(adler, (unsigned char *)data, datasize); - write_big_endian(adler); - - /* File end magic. - */ - printf("file"); -} - -static void _archive(char *in, int ilen); - -static void -_archive_dir(char *in, int ilen) -{ - int t; - DIR *d; - struct dirent *de; - - if (verbose) { - fprintf(stderr, "_archive_dir('%s', %d)\n", in, ilen); - } - - d = opendir(in); - if (d == 0) { - die("cannot open directory '%s'", in); - } - - while ((de = readdir(d)) != 0) { - /* xxx: feature? maybe some dotfiles are okay */ - if (strcmp(de->d_name, ".") == 0 || - strcmp(de->d_name, "..") == 0) - { - continue; - } - - t = strlen(de->d_name); - in[ilen] = '/'; - memcpy(in + ilen + 1, de->d_name, t + 1); - - _archive(in, ilen + t + 1); - - in[ilen] = '\0'; - } -} - -static void -_archive(char *in, int ilen) -{ - struct stat s; - - if (verbose) { - fprintf(stderr, "_archive('%s', %d)\n", in, ilen); - } - - if (lstat(in, &s)) { - die("could not stat '%s'\n", in); - } - - if (S_ISREG(s.st_mode)) { - char *tmp; - int fd; - - fd = open(in, O_RDONLY); - if (fd < 0) { - die("cannot open '%s' for read", in); - } - - tmp = (char*) malloc(s.st_size); - if (tmp == 0) { - die("cannot allocate %d bytes", s.st_size); - } - - if (read(fd, tmp, s.st_size) != s.st_size) { - die("cannot read %d bytes", s.st_size); - } - - _eject(&s, in, ilen, tmp, s.st_size); - - free(tmp); - close(fd); - } else if (S_ISDIR(s.st_mode)) { - _archive_dir(in, ilen); - } else { - /* We don't handle links, etc. */ - die("Unknown '%s' (mode %d)?\n", in, s.st_mode); - } -} - -void archive(const char *start) -{ - char in[8192]; - - strcpy(in, start); - - _archive_dir(in, strlen(in)); -} - -int -main(int argc, char *argv[]) -{ - struct termios old_termios; - - if (argc == 1) { - die("usage: %s ", argv[0]); - } - argc--; - argv++; - - /* Force stdout into raw mode. - */ - struct termios s; - if (tcgetattr(1, &s) < 0) { - die("Could not get termios for stdout"); - } - old_termios = s; - cfmakeraw(&s); - if (tcsetattr(1, TCSANOW, &s) < 0) { - die("Could not set termios for stdout"); - } - - /* Print format magic and version. - */ - printf("AFAR\n"); - write_big_endian(1); - - while (argc-- > 0) { - archive(*argv++); - } - - /* Print end magic. - */ - printf("END"); - putchar('\0'); - - /* Restore stdout. - */ - if (tcsetattr(1, TCSANOW, &old_termios) < 0) { - die("Could not restore termios for stdout"); - } - - return 0; -} diff --git a/tools/dexpreopt/dexopt-wrapper/Android.mk b/tools/dexpreopt/dexopt-wrapper/Android.mk deleted file mode 100644 index ae2b6a3e7..000000000 --- a/tools/dexpreopt/dexopt-wrapper/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - DexOptWrapper.cpp - -LOCAL_C_INCLUDES += \ - dalvik - -LOCAL_STATIC_LIBRARIES := \ - libdex - -LOCAL_SHARED_LIBRARIES := \ - libcutils - -LOCAL_MODULE := dexopt-wrapper - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) diff --git a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp b/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp deleted file mode 100644 index 102cf0e7c..000000000 --- a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp +++ /dev/null @@ -1,173 +0,0 @@ -/* - * dexopt invocation test. - * - * You must have BOOTCLASSPATH defined. On the simulator, you will also - * need ANDROID_ROOT. - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "cutils/properties.h" - -//using namespace android; - -/* - * Privilege reduction function. - * - * Returns 0 on success, nonzero on failure. - */ -static int privFunc(void) -{ - printf("--- would reduce privs here\n"); - return 0; -} - -/* - * We're in the child process. exec dexopt. - */ -static void runDexopt(int zipFd, int odexFd, const char* inputFileName) -{ - static const char* kDexOptBin = "/bin/dexopt"; - static const int kMaxIntLen = 12; // '-'+10dig+'\0' -OR- 0x+8dig - char zipNum[kMaxIntLen]; - char odexNum[kMaxIntLen]; - char dexoptFlags[PROPERTY_VALUE_MAX]; - const char* androidRoot; - char* execFile; - - /* pull optional configuration tweaks out of properties */ - property_get("dalvik.vm.dexopt-flags", dexoptFlags, ""); - - /* find dexopt executable; this exists for simulator compatibility */ - androidRoot = getenv("ANDROID_ROOT"); - if (androidRoot == NULL) - androidRoot = "/system"; - execFile = (char*) malloc(strlen(androidRoot) + strlen(kDexOptBin) +1); - sprintf(execFile, "%s%s", androidRoot, kDexOptBin); - - sprintf(zipNum, "%d", zipFd); - sprintf(odexNum, "%d", odexFd); - - execl(execFile, execFile, "--zip", zipNum, odexNum, inputFileName, - dexoptFlags, (char*) NULL); - fprintf(stderr, "execl(%s) failed: %s\n", kDexOptBin, strerror(errno)); -} - -/* - * Run dexopt on the specified Jar/APK. - * - * This uses fork() and exec() to mimic the way this would work in an - * installer; in practice for something this simple you could just exec() - * unless you really wanted the status messages. - * - * Returns 0 on success. - */ -int doStuff(const char* zipName, const char* odexName) -{ - int zipFd, odexFd; - - /* - * Open the zip archive and the odex file, creating the latter (and - * failing if it already exists). This must be done while we still - * have sufficient privileges to read the source file and create a file - * in the target directory. The "classes.dex" file will be extracted. - */ - zipFd = open(zipName, O_RDONLY, 0); - if (zipFd < 0) { - fprintf(stderr, "Unable to open '%s': %s\n", zipName, strerror(errno)); - return 1; - } - - odexFd = open(odexName, O_RDWR | O_CREAT | O_EXCL, 0644); - if (odexFd < 0) { - fprintf(stderr, "Unable to create '%s': %s\n", - odexName, strerror(errno)); - close(zipFd); - return 1; - } - - printf("--- BEGIN '%s' (bootstrap=%d) ---\n", zipName, 0); - - /* - * Fork a child process. - */ - pid_t pid = fork(); - if (pid == 0) { - /* child -- drop privs */ - if (privFunc() != 0) - exit(66); - - /* lock the input file */ - if (flock(odexFd, LOCK_EX | LOCK_NB) != 0) { - fprintf(stderr, "Unable to lock '%s': %s\n", - odexName, strerror(errno)); - exit(65); - } - - runDexopt(zipFd, odexFd, zipName); /* does not return */ - exit(67); /* usually */ - } else { - /* parent -- wait for child to finish */ - printf("--- waiting for verify+opt, pid=%d\n", (int) pid); - int status, oldStatus; - pid_t gotPid; - - close(zipFd); - close(odexFd); - - /* - * Wait for the optimization process to finish. - */ - while (true) { - gotPid = waitpid(pid, &status, 0); - if (gotPid == -1 && errno == EINTR) { - printf("waitpid interrupted, retrying\n"); - } else { - break; - } - } - if (gotPid != pid) { - fprintf(stderr, "waitpid failed: wanted %d, got %d: %s\n", - (int) pid, (int) gotPid, strerror(errno)); - return 1; - } - - if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { - printf("--- END '%s' (success) ---\n", zipName); - return 0; - } else { - printf("--- END '%s' --- status=0x%04x, process failed\n", - zipName, status); - return 1; - } - } - - /* notreached */ -} - -/* - * Parse args, do stuff. - */ -int main(int argc, char** argv) -{ - if (argc < 3 || argc > 4) { - fprintf(stderr, "Usage: %s " - "[]\n\n", argv[0]); - fprintf(stderr, "Example: dexopttest " - "/system/app/NotePad.apk /system/app/NotePad.odex\n"); - return 2; - } - - if (argc > 3) { - setenv("BOOTCLASSPATH", argv[3], 1); - } - - return (doStuff(argv[1], argv[2]) != 0); -} diff --git a/tools/dexpreopt/dexpreopt.py b/tools/dexpreopt/dexpreopt.py deleted file mode 100755 index a8f812801..000000000 --- a/tools/dexpreopt/dexpreopt.py +++ /dev/null @@ -1,986 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2008 The Android Open Source Project -# -# 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. -# - -"""Creates optimized versions of APK files. - -A tool and associated functions to communicate with an Android -emulator instance, run commands, and scrape out files. - -Requires at least python2.4. -""" - -import array -import datetime -import optparse -import os -import posix -import select -import signal -import struct -import subprocess -import sys -import tempfile -import time -import zlib - - -_emulator_popen = None -_DEBUG_READ = 1 - - -def EnsureTempDir(path=None): - """Creates a temporary directory and returns its path. - - Creates any necessary parent directories. - - Args: - path: If specified, used as the temporary directory. If not specified, - a safe temporary path is created. The caller is responsible for - deleting the directory. - - Returns: - The path to the new directory, or None if a problem occurred. - """ - if path is None: - path = tempfile.mkdtemp('', 'dexpreopt-') - elif not os.path.exists(path): - os.makedirs(path) - elif not os.path.isdir(path): - return None - return path - - -def CreateZeroedFile(path, length): - """Creates the named file and writes zero bytes to it. - - Unlinks the file first if it already exists. - Creates its containing directory if necessary. - - Args: - path: The path to the file to create. - length: The number of zero bytes to write to the file. - - Returns: - True on success. - """ - subprocess.call(['rm', '-f', path]) - d = os.path.dirname(path) - if d and not os.path.exists(d): os.makedirs(os.path.dirname(d)) - # TODO: redirect child's stdout to /dev/null - ret = subprocess.call(['dd', 'if=/dev/zero', 'of=%s' % path, - 'bs=%d' % length, 'count=1']) - return not ret # i.e., ret == 0; i.e., the child exited successfully. - - -def StartEmulator(exe_name='emulator', kernel=None, - ramdisk=None, image=None, userdata=None, system=None): - """Runs the emulator with the specified arguments. - - Args: - exe_name: The name of the emulator to run. May be absolute, relative, - or unqualified (and left to exec() to find). - kernel: If set, passed to the emulator as "-kernel". - ramdisk: If set, passed to the emulator as "-ramdisk". - image: If set, passed to the emulator as "-system". - userdata: If set, passed to the emulator as "-initdata" and "-data". - system: If set, passed to the emulator as "-sysdir". - - Returns: - A subprocess.Popen that refers to the emulator process, or None if - a problem occurred. - """ - #exe_name = './stuff' - args = [exe_name] - if kernel: args += ['-kernel', kernel] - if ramdisk: args += ['-ramdisk', ramdisk] - if image: args += ['-system', image] - if userdata: args += ['-initdata', userdata, '-data', userdata] - if system: args += ['-sysdir', system] - args += ['-partition-size', '128'] - args += ['-no-window', '-netfast', '-noaudio'] - - _USE_PIPE = True - - if _USE_PIPE: - # Use dedicated fds instead of stdin/out to talk to the - # emulator so that the emulator doesn't try to tty-cook - # the data. - em_stdin_r, em_stdin_w = posix.pipe() - em_stdout_r, em_stdout_w = posix.pipe() - args += ['-shell-serial', 'fdpair:%d:%d' % (em_stdin_r, em_stdout_w)] - else: - args += ['-shell'] - - # This is a work-around for the ARMv7 emulation bug. - # XXX: It only works by chance, if any ! A real emulation fix is on the way - args += ['-qemu', '-singlestep'] - - # Ensure that this environment variable isn't set; - # if it is, the emulator will print the log to stdout. - if os.environ.get('ANDROID_LOG_TAGS'): - del os.environ['ANDROID_LOG_TAGS'] - - try: - # bufsize=1 line-buffered, =0 unbuffered, - # <0 system default (fully buffered) - Trace('Running emulator: %s' % ' '.join(args)) - if _USE_PIPE: - ep = subprocess.Popen(args) - else: - ep = subprocess.Popen(args, close_fds=True, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - if ep: - if _USE_PIPE: - # Hijack the Popen.stdin/.stdout fields to point to our - # pipes. These are the same fields that would have been set - # if we called Popen() with stdin=subprocess.PIPE, etc. - # Note that these names are from the point of view of the - # child process. - # - # Since we'll be using select.select() to read data a byte - # at a time, it's important that these files are unbuffered - # (bufsize=0). If Popen() took care of the pipes, they're - # already unbuffered. - ep.stdin = os.fdopen(em_stdin_w, 'w', 0) - ep.stdout = os.fdopen(em_stdout_r, 'r', 0) - return ep - except OSError, e: - print >>sys.stderr, 'Could not start emulator:', e - return None - - -def IsDataAvailable(fo, timeout=0): - """Indicates whether or not data is available to be read from a file object. - - Args: - fo: A file object to read from. - timeout: The number of seconds to wait for data, or zero for no timeout. - - Returns: - True iff data is available to be read. - """ - return select.select([fo], [], [], timeout) == ([fo], [], []) - - -def ConsumeAvailableData(fo): - """Reads data from a file object while it's available. - - Stops when no more data is immediately available or upon reaching EOF. - - Args: - fo: A file object to read from. - - Returns: - An unsigned byte array.array of the data that was read. - """ - buf = array.array('B') - while IsDataAvailable(fo): - try: - buf.fromfile(fo, 1) - except EOFError: - break - return buf - - -def ShowTimeout(timeout, end_time): - """For debugging, display the timeout info. - - Args: - timeout: the timeout in seconds. - end_time: a time.time()-based value indicating when the timeout should - expire. - """ - if _DEBUG_READ: - if timeout: - remaining = end_time - time.time() - Trace('ok, time remaining %.1f of %.1f' % (remaining, timeout)) - else: - Trace('ok (no timeout)') - - -def WaitForString(inf, pattern, timeout=0, max_len=0, eat_to_eol=True, - reset_on_activity=False): - """Reads from a file object and returns when the pattern matches the data. - - Reads a byte at a time to avoid consuming extra data, so do not call - this function when you expect the pattern to match a large amount of data. - - Args: - inf: The file object to read from. - pattern: The string to look for in the input data. - May be a tuple of strings. - timeout: How long to wait, in seconds. No timeout if it evaluates to False. - max_len: Return None if this many bytes have been read without matching. - No upper bound if it evaluates to False. - eat_to_eol: If true, the input data will be consumed until a '\\n' or EOF - is encountered. - reset_on_activity: If True, reset the timeout whenever a character is - read. - - Returns: - The input data matching the expression as an unsigned char array, - or None if the operation timed out or didn't match after max_len bytes. - - Raises: - IOError: An error occurred reading from the input file. - """ - if timeout: - end_time = time.time() + timeout - else: - end_time = 0 - - if _DEBUG_READ: - Trace('WaitForString: "%s", %.1f' % (pattern, timeout)) - - buf = array.array('B') # unsigned char array - eating = False - while True: - if end_time: - remaining = end_time - time.time() - if remaining <= 0: - Trace('Timeout expired after %.1f seconds' % timeout) - return None - else: - remaining = None - - if IsDataAvailable(inf, remaining): - if reset_on_activity and timeout: - end_time = time.time() + timeout - - buf.fromfile(inf, 1) - if _DEBUG_READ: - c = buf.tostring()[-1:] - ci = ord(c) - if ci < 0x20: c = '.' - if _DEBUG_READ > 1: - print 'read [%c] 0x%02x' % (c, ci) - - if not eating: - if buf.tostring().endswith(pattern): - if eat_to_eol: - if _DEBUG_READ > 1: - Trace('Matched; eating to EOL') - eating = True - else: - ShowTimeout(timeout, end_time) - return buf - if _DEBUG_READ > 2: - print '/%s/ ? "%s"' % (pattern, buf.tostring()) - else: - if buf.tostring()[-1:] == '\n': - ShowTimeout(timeout, end_time) - return buf - - if max_len and len(buf) >= max_len: return None - - -def WaitForEmulator(ep, timeout=0): - """Waits for the emulator to start up and print the first prompt. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - timeout: How long to wait, in seconds. No timeout if it evaluates to False. - - Returns: - True on success, False if the timeout occurred. - """ - # Prime the pipe; the emulator doesn't start without this. - print >>ep.stdin, '' - - # Wait until the console is ready and the first prompt appears. - buf = WaitForString(ep.stdout, '#', timeout=timeout, eat_to_eol=False) - if buf: - Trace('Saw the prompt: "%s"' % buf.tostring()) - return True - return False - - -def WaitForPrompt(ep, prompt=None, timeout=0, reset_on_activity=False): - """Blocks until the prompt appears on ep.stdout or the timeout elapses. - - Args: - ep: A subprocess.Popen connection to the emulator process. - prompt: The prompt to wait for. If None, uses ep.prompt. - timeout: How many seconds to wait for the prompt. Waits forever - if timeout is zero. - reset_on_activity: If True, reset the timeout whenever a character is - read. - - Returns: - A string containing the data leading up to the prompt. The string - will always end in '\\n'. Returns None if the prompt was not seen - within the timeout, or if some other error occurred. - """ - if not prompt: prompt = ep.prompt - if prompt: - #Trace('waiting for prompt "%s"' % prompt) - data = WaitForString(ep.stdout, prompt, - timeout=timeout, reset_on_activity=reset_on_activity) - if data: - # data contains everything on ep.stdout up to and including the prompt, - # plus everything up 'til the newline. Scrape out the prompt - # and everything that follows, and ensure that the result ends - # in a newline (which is important if it would otherwise be empty). - s = data.tostring() - i = s.rfind(prompt) - s = s[:i] - if s[-1:] != '\n': - s += '\n' - if _DEBUG_READ: - print 'WaitForPrompt saw """\n%s"""' % s - return s - return None - - -def ReplaceEmulatorPrompt(ep, prompt=None): - """Replaces PS1 in the emulator with a different value. - - This is useful for making the prompt unambiguous; i.e., something - that probably won't appear in the output of another command. - - Assumes that the emulator is already sitting at a prompt, - waiting for shell input. - - Puts the new prompt in ep.prompt. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - prompt: The new prompt to use - - Returns: - True on success, False if the timeout occurred. - """ - if not prompt: - prompt = '-----DEXPREOPT-PROMPT-----' - print >>ep.stdin, 'PS1="%s\n"' % prompt - ep.prompt = prompt - - # Eat the command echo. - data = WaitForPrompt(ep, timeout=2) - if not data: - return False - - # Make sure it's actually there. - return WaitForPrompt(ep, timeout=2) - - -def RunEmulatorCommand(ep, cmd, timeout=0): - """Sends the command to the emulator's shell and waits for the result. - - Assumes that the emulator is already sitting at a prompt, - waiting for shell input. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - cmd: The shell command to run in the emulator. - timeout: The number of seconds to wait for the command to complete, - or zero for no timeout. - - Returns: - If the command ran and returned to the console prompt before the - timeout, returns the output of the command as a string. - Returns None otherwise. - """ - ConsumeAvailableData(ep.stdout) - - Trace('Running "%s"' % cmd) - print >>ep.stdin, '%s' % cmd - - # The console will echo the command. - #Trace('Waiting for echo') - if WaitForString(ep.stdout, cmd, timeout=timeout): - #Trace('Waiting for completion') - return WaitForPrompt(ep, timeout=timeout, reset_on_activity=True) - - return None - - -def ReadFileList(ep, dir_list, timeout=0): - """Returns a list of emulator files in each dir in dir_list. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - dir_list: List absolute paths to directories to read. - timeout: The number of seconds to wait for the command to complete, - or zero for no timeout. - - Returns: - A list of absolute paths to files in the named directories, - in the context of the emulator's filesystem. - None on failure. - """ - ret = [] - for d in dir_list: - output = RunEmulatorCommand(ep, 'ls ' + d, timeout=timeout) - if not output: - Trace('Could not ls ' + d) - return None - ret += ['%s/%s' % (d, f) for f in output.splitlines()] - return ret - - -def DownloadDirectoryHierarchy(ep, src, dest, timeout=0): - """Recursively downloads an emulator directory to the local filesystem. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - src: The path on the emulator's filesystem to download from. - dest: The path on the local filesystem to download to. - timeout: The number of seconds to wait for the command to complete, - or zero for no timeout. (CURRENTLY IGNORED) - - Returns: - True iff the files downloaded successfully, False otherwise. - """ - ConsumeAvailableData(ep.stdout) - - if not os.path.exists(dest): - os.makedirs(dest) - - cmd = 'afar %s' % src - Trace('Running "%s"' % cmd) - print >>ep.stdin, '%s' % cmd - - # The console will echo the command. - #Trace('Waiting for echo') - if not WaitForString(ep.stdout, cmd, timeout=timeout): - return False - - #TODO: use a signal to support timing out? - - # - # Android File Archive format: - # - # magic[5]: 'A' 'F' 'A' 'R' '\n' - # version[4]: 0x00 0x00 0x00 0x01 - # for each file: - # file magic[4]: 'F' 'I' 'L' 'E' - # namelen[4]: Length of file name, including NUL byte (big-endian) - # name[*]: NUL-terminated file name - # datalen[4]: Length of file (big-endian) - # data[*]: Unencoded file data - # adler32[4]: adler32 of the unencoded file data (big-endian) - # file end magic[4]: 'f' 'i' 'l' 'e' - # end magic[4]: 'E' 'N' 'D' 0x00 - # - - # Read the header. - HEADER = array.array('B', 'AFAR\n\000\000\000\001') - buf = array.array('B') - buf.fromfile(ep.stdout, len(HEADER)) - if buf != HEADER: - Trace('Header does not match: "%s"' % buf) - return False - - # Read the file entries. - FILE_START = array.array('B', 'FILE') - FILE_END = array.array('B', 'file') - END = array.array('B', 'END\000') - while True: - # Entry magic. - buf = array.array('B') - buf.fromfile(ep.stdout, 4) - if buf == FILE_START: - # Name length (4 bytes, big endian) - buf = array.array('B') - buf.fromfile(ep.stdout, 4) - (name_len,) = struct.unpack('>I', buf) - #Trace('name len %d' % name_len) - - # Name, NUL-terminated. - buf = array.array('B') - buf.fromfile(ep.stdout, name_len) - buf.pop() # Remove trailing NUL byte. - file_name = buf.tostring() - Trace('FILE: %s' % file_name) - - # File length (4 bytes, big endian) - buf = array.array('B') - buf.fromfile(ep.stdout, 4) - (file_len,) = struct.unpack('>I', buf) - - # File data. - data = array.array('B') - data.fromfile(ep.stdout, file_len) - #Trace('FILE: read %d bytes from %s' % (file_len, file_name)) - - # adler32 (4 bytes, big endian) - buf = array.array('B') - buf.fromfile(ep.stdout, 4) - (adler32,) = struct.unpack('>i', buf) # adler32 wants a signed int ('i') - data_adler32 = zlib.adler32(data) - # Because of a difference in behavior of zlib.adler32 on 32-bit and 64-bit - # systems (one returns signed values, the other unsigned), we take the - # modulo 2**32 of the checksums, and compare those. - # See also http://bugs.python.org/issue1202 - if (adler32 % (2**32)) != (data_adler32 % (2**32)): - Trace('adler32 does not match: calculated 0x%08x != expected 0x%08x' % - (data_adler32, adler32)) - return False - - # File end magic. - buf = array.array('B') - buf.fromfile(ep.stdout, 4) - if buf != FILE_END: - Trace('Unexpected file end magic "%s"' % buf) - return False - - # Write to the output file - out_file_name = dest + '/' + file_name[len(src):] - p = os.path.dirname(out_file_name) - if not os.path.exists(p): os.makedirs(p) - fo = file(out_file_name, 'w+b') - fo.truncate(0) - Trace('FILE: Writing %d bytes to %s' % (len(data), out_file_name)) - data.tofile(fo) - fo.close() - - elif buf == END: - break - else: - Trace('Unexpected magic "%s"' % buf) - return False - - return WaitForPrompt(ep, timeout=timeout, reset_on_activity=True) - - -def ReadBootClassPath(ep, timeout=0): - """Reads and returns the default bootclasspath as a list of files. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - timeout: The number of seconds to wait for the command to complete, - or zero for no timeout. - - Returns: - The bootclasspath as a list of strings. - None on failure. - """ - bcp = RunEmulatorCommand(ep, 'echo $BOOTCLASSPATH', timeout=timeout) - if not bcp: - Trace('Could not find bootclasspath') - return None - return bcp.strip().split(':') # strip trailing newline - - -def RunDexoptOnFileList(ep, files, dest_root, move=False, timeout=0): - """Creates the corresponding .odex file for all jar/apk files in 'files'. - Copies the .odex file to a location under 'dest_root'. If 'move' is True, - the file is moved instead of copied. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - files: The list of files to optimize - dest_root: directory to copy/move odex files to. Must already exist. - move: if True, move rather than copy files - timeout: The number of seconds to wait for the command to complete, - or zero for no timeout. - - Returns: - True on success, False on failure. - """ - for jar_file in files: - if jar_file.endswith('.apk') or jar_file.endswith('.jar'): - odex_file = jar_file[:jar_file.rfind('.')] + '.odex' - cmd = 'dexopt-wrapper %s %s' % (jar_file, odex_file) - if not RunEmulatorCommand(ep, cmd, timeout=timeout): - Trace('"%s" failed' % cmd) - return False - - # Always copy the odex file. There's no cp(1), so we - # cat out to the new file. - dst_odex = dest_root + odex_file - cmd = 'cat %s > %s' % (odex_file, dst_odex) # no cp(1) - if not RunEmulatorCommand(ep, cmd, timeout=timeout): - Trace('"%s" failed' % cmd) - return False - - # Move it if we're asked to. We can't use mv(1) because - # the files tend to move between filesystems. - if move: - cmd = 'rm %s' % odex_file - if not RunEmulatorCommand(ep, cmd, timeout=timeout): - Trace('"%s" failed' % cmd) - return False - return True - - -def InstallCacheFiles(cache_system_dir, out_system_dir): - """Install files in cache_system_dir to the proper places in out_system_dir. - - cache_system_dir contains various files from /system, plus .odex files - for most of the .apk/.jar files that live there. - This function copies each .odex file from the cache dir to the output dir - and removes "classes.dex" from each appropriate .jar/.apk. - - E.g., /app/NotePad.odex would be copied to - /app/NotePad.odex, and /app/NotePad.apk - would have its classes.dex file removed. - - Args: - cache_system_dir: The directory containing the cache files scraped from - the emulator. - out_system_dir: The local directory that corresponds to "/system" - on the device filesystem. (the root of system.img) - - Returns: - True if everything succeeded, False if any problems occurred. - """ - # First, walk through cache_system_dir and copy every .odex file - # over to out_system_dir, ensuring that the destination directory - # contains the corresponding source file. - for root, dirs, files in os.walk(cache_system_dir): - for name in files: - if name.endswith('.odex'): - odex_file = os.path.join(root, name) - - # Find the path to the .odex file's source apk/jar file. - out_stem = odex_file[len(cache_system_dir):odex_file.rfind('.')] - out_stem = out_system_dir + out_stem; - jar_file = out_stem + '.jar' - if not os.path.exists(jar_file): - jar_file = out_stem + '.apk' - if not os.path.exists(jar_file): - Trace('Cannot find source .jar/.apk for %s: %s' % - (odex_file, out_stem + '.{jar,apk}')) - return False - - # Copy the cache file next to the source file. - cmd = ['cp', odex_file, out_stem + '.odex'] - ret = subprocess.call(cmd) - if ret: # non-zero exit status - Trace('%s failed' % ' '.join(cmd)) - return False - - # Walk through the output /system directory, making sure - # that every .jar/.apk has an odex file. While we do this, - # remove the classes.dex entry from each source archive. - for root, dirs, files in os.walk(out_system_dir): - for name in files: - if name.endswith('.apk') or name.endswith('.jar'): - jar_file = os.path.join(root, name) - odex_file = jar_file[:jar_file.rfind('.')] + '.odex' - if not os.path.exists(odex_file): - if root.endswith('/system/app') or root.endswith('/system/framework'): - Trace('jar/apk %s has no .odex file %s' % (jar_file, odex_file)) - return False - else: - continue - - # Attempting to dexopt a jar with no classes.dex currently - # creates a 40-byte odex file. - # TODO: use a more reliable check - if os.path.getsize(odex_file) > 100: - # Remove classes.dex from the .jar file. - cmd = ['zip', '-dq', jar_file, 'classes.dex'] - ret = subprocess.call(cmd) - if ret: # non-zero exit status - Trace('"%s" failed' % ' '.join(cmd)) - return False - else: - # Some of the apk files don't contain any code. - if not name.endswith('.apk'): - Trace('%s has a zero-length odex file' % jar_file) - return False - cmd = ['rm', odex_file] - ret = subprocess.call(cmd) - if ret: # non-zero exit status - Trace('"%s" failed' % ' '.join(cmd)) - return False - - return True - - -def KillChildProcess(p, sig=signal.SIGTERM, timeout=0): - """Waits for a child process to die without getting stuck in wait(). - - After Jean Brouwers's 2004 post to python-list. - - Args: - p: A subprocess.Popen representing the child process to kill. - sig: The signal to send to the child process. - timeout: How many seconds to wait for the child process to die. - If zero, do not time out. - - Returns: - The exit status of the child process, if it was successfully killed. - The final value of p.returncode if it wasn't. - """ - os.kill(p.pid, sig) - if timeout > 0: - while p.poll() < 0: - if timeout > 0.5: - timeout -= 0.25 - time.sleep(0.25) - else: - os.kill(p.pid, signal.SIGKILL) - time.sleep(0.5) - p.poll() - break - else: - p.wait() - return p.returncode - - -def Trace(msg): - """Prints a message to stdout. - - Args: - msg: The message to print. - """ - #print 'dexpreopt: %s' % msg - when = datetime.datetime.now() - print '%02d:%02d.%d dexpreopt: %s' % (when.minute, when.second, when.microsecond, msg) - - -def KillEmulator(): - """Attempts to kill the emulator process, if it is running. - - Returns: - The exit status of the emulator process, or None if the emulator - was not running or was unable to be killed. - """ - global _emulator_popen - if _emulator_popen: - Trace('Killing emulator') - try: - ret = KillChildProcess(_emulator_popen, sig=signal.SIGINT, timeout=5) - except OSError: - Trace('Could not kill emulator') - ret = None - _emulator_popen = None - return ret - return None - - -def Fail(msg=None): - """Prints an error and causes the process to exit. - - Args: - msg: Additional error string to print (optional). - - Returns: - Does not return. - """ - s = 'dexpreopt: ERROR' - if msg: s += ': %s' % msg - print >>sys.stderr, msg - KillEmulator() - sys.exit(1) - - -def PrintUsage(msg=None): - """Prints commandline usage information for the tool and exits with an error. - - Args: - msg: Additional string to print (optional). - - Returns: - Does not return. - """ - if msg: - print >>sys.stderr, 'dexpreopt: %s', msg - print >>sys.stderr, """Usage: dexpreopt -Required options: - -kernel Kernel to use when running the emulator - -ramdisk Ramdisk to use when running the emulator - -image System image to use when running the - emulator. /system/app should contain the - .apk files to optimize, and any required - bootclasspath libraries must be present - in the correct locations. - -system The product directory, which usually contains - files like 'system.img' (files other than - the kernel in that directory won't - be used) - -outsystemdir A fully-populated /system directory, ready - to be modified to contain the optimized - files. The appropriate .jar/.apk files - will be stripped of their classes.dex - entries, and the optimized .dex files - will be added alongside the packages - that they came from. -Optional: - -tmpdir If specified, use this directory for - intermediate objects. If not specified, - a unique directory under the system - temp dir is used. - """ - sys.exit(2) - - -def ParseArgs(argv): - """Parses commandline arguments. - - Args: - argv: A list of arguments; typically sys.argv[1:] - - Returns: - A tuple containing two dictionaries; the first contains arguments - that will be passsed to the emulator, and the second contains other - arguments. - """ - parser = optparse.OptionParser() - - parser.add_option('--kernel', help='Passed to emulator') - parser.add_option('--ramdisk', help='Passed to emulator') - parser.add_option('--image', help='Passed to emulator') - parser.add_option('--system', help='Passed to emulator') - parser.add_option('--outsystemdir', help='Destination /system directory') - parser.add_option('--tmpdir', help='Optional temp directory to use') - - options, args = parser.parse_args(args=argv) - if args: PrintUsage() - - emulator_args = {} - other_args = {} - if options.kernel: emulator_args['kernel'] = options.kernel - if options.ramdisk: emulator_args['ramdisk'] = options.ramdisk - if options.image: emulator_args['image'] = options.image - if options.system: emulator_args['system'] = options.system - if options.outsystemdir: other_args['outsystemdir'] = options.outsystemdir - if options.tmpdir: other_args['tmpdir'] = options.tmpdir - - return (emulator_args, other_args) - - -def DexoptEverything(ep, dest_root): - """Logic for finding and dexopting files in the necessary order. - - Args: - ep: A subprocess.Popen object referring to the emulator process. - dest_root: directory to copy/move odex files to - - Returns: - True on success, False on failure. - """ - _extra_tests = False - if _extra_tests: - if not RunEmulatorCommand(ep, 'ls /system/app', timeout=5): - Fail('Could not ls') - - # We're very short on space, so remove a bunch of big stuff that we - # don't need. - cmd = 'rm -r /system/sounds /system/media /system/fonts /system/xbin' - if not RunEmulatorCommand(ep, cmd, timeout=40): - Trace('"%s" failed' % cmd) - return False - - Trace('Read file list') - jar_dirs = ['/system/framework', '/system/app'] - files = ReadFileList(ep, jar_dirs, timeout=5) - if not files: - Fail('Could not list files in %s' % ' '.join(jar_dirs)) - #Trace('File list:\n"""\n%s\n"""' % '\n'.join(files)) - - bcp = ReadBootClassPath(ep, timeout=2) - if not files: - Fail('Could not sort by bootclasspath') - - # Remove bootclasspath entries from the main file list. - for jar in bcp: - try: - files.remove(jar) - except ValueError: - Trace('File list does not contain bootclasspath entry "%s"' % jar) - return False - - # Create the destination directories. - for d in ['', '/system'] + jar_dirs: - cmd = 'mkdir %s%s' % (dest_root, d) - if not RunEmulatorCommand(ep, cmd, timeout=4): - Trace('"%s" failed' % cmd) - return False - - # First, dexopt the bootclasspath. Keep their cache files in place. - Trace('Dexopt %d bootclasspath files' % len(bcp)) - if not RunDexoptOnFileList(ep, bcp, dest_root, timeout=120): - Trace('Could not dexopt bootclasspath') - return False - - # dexopt the rest. To avoid running out of space on the emulator - # volume, move each cache file after it's been created. - Trace('Dexopt %d files' % len(files)) - if not RunDexoptOnFileList(ep, files, dest_root, move=True, timeout=120): - Trace('Could not dexopt files') - return False - - if _extra_tests: - if not RunEmulatorCommand(ep, 'ls /system/app', timeout=5): - Fail('Could not ls') - - return True - - - -def MainInternal(): - """Main function that can be wrapped in a try block. - - Returns: - Nothing. - """ - emulator_args, other_args = ParseArgs(sys.argv[1:]) - - tmp_dir = EnsureTempDir(other_args.get('tmpdir')) - if not tmp_dir: Fail('Could not create temp dir') - - Trace('Creating data image') - userdata = '%s/data.img' % tmp_dir - if not CreateZeroedFile(userdata, 32 * 1024 * 1024): - Fail('Could not create data image file') - emulator_args['userdata'] = userdata - - ep = StartEmulator(**emulator_args) - if not ep: Fail('Could not start emulator') - global _emulator_popen - _emulator_popen = ep - - # TODO: unlink the big userdata file now, since the emulator - # has it open. - - if not WaitForEmulator(ep, timeout=120): Fail('Emulator did not respond') - if not ReplaceEmulatorPrompt(ep): Fail('Could not replace prompt') - - dest_root = '/data/dexpreopt-root' - if not DexoptEverything(ep, dest_root): Fail('Could not dexopt files') - - # Grab the odex files that were left in dest_root. - cache_system_dir = tmp_dir + '/cache-system' - if not DownloadDirectoryHierarchy(ep, dest_root + '/system', - cache_system_dir, - timeout=20): - Fail('Could not download %s/system from emulator' % dest_root) - - if not InstallCacheFiles(cache_system_dir=cache_system_dir, - out_system_dir=other_args['outsystemdir']): - Fail('Could not install files') - - Trace('dexpreopt successful') - # Success! - - -def main(): - try: - MainInternal() - finally: - KillEmulator() - - -if __name__ == '__main__': - main() diff --git a/tools/dexpreopt/geninitrc.awk b/tools/dexpreopt/geninitrc.awk deleted file mode 100644 index 4b67e78e0..000000000 --- a/tools/dexpreopt/geninitrc.awk +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (C) 2009 The Android Open Source Project -# -# 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. -# -BEGIN { - fixed_remount = 0; - console_state = 0; -} - -/^ mount yaffs2 mtd@system \/system ro remount$/ { - fixed_remount = 1; - print " # dexpreopt needs to write to /system"; - print " ### " $0; - next; -} - -console_state == 0 && /^service console \/system\/bin\/sh$/ { - console_state = 1; - print; - next; -} - -console_state == 1 && /^ console$/ { - console_state = 2; - print; - exit; -} - -console_state == 1 { - # The second line of the console entry should always immediately - # follow the first. - exit; -} - -{ print } - -END { - failed = 0; - if (fixed_remount != 1) { - print "ERROR: no match for remount line" > "/dev/stderr"; - failed = 1; - } - if (console_state != 2) { - print "ERROR: no match for console lines" > "/dev/stderr"; - failed = 1; - } - if (failed == 1) { - print ">>>> FAILED <<<<" - exit 1; - } -} From ae73f1cc3fd4714a25259ebededf0711767b4915 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Sun, 26 Sep 2010 16:50:27 -0700 Subject: [PATCH 094/246] GRG88B Change-Id: Ib424b43faaf2ea41147d63433bf4d7436f2b968d --- 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 46002950d..af8db73ea 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=GRG88 +export BUILD_ID=GRG88B From 373dad8a6caac3155fef9d58c4db550f0ca0a61e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 Sep 2010 18:06:09 -0700 Subject: [PATCH 095/246] GRG88C Change-Id: Ibb63682b3948a242414bf3f2229f31a0b2111227 --- 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 af8db73ea..1ebdc3ea4 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=GRG88B +export BUILD_ID=GRG88C From f6fd4b498f6af889eb9eabde6ea6ddfbdf2a7e9c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Sep 2010 07:39:08 -0700 Subject: [PATCH 096/246] GRG89 Change-Id: Ibd3d2164255d6168a085ee56590042f3cc582cb5 --- 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 1ebdc3ea4..1a5d04013 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=GRG88C +export BUILD_ID=GRG89 From 71074ef35f0e2ef826f4fddf40f91fa3a6bc650e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Sep 2010 07:14:30 -0700 Subject: [PATCH 097/246] GRG90 Change-Id: I17c45affaf12d69664f6cecb4bf4c184427ea8da --- 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 1a5d04013..a01a86a56 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=GRG89 +export BUILD_ID=GRG90 From a2f3be605e8f7c1deece1769e8131d90af2aac1e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Sep 2010 14:38:02 -0700 Subject: [PATCH 098/246] GRG90B Change-Id: Ia56781cc374c7c50907a3f72d4409641216ea4a5 --- 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 a01a86a56..04b28a7fb 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=GRG90 +export BUILD_ID=GRG90B From e3d6a6e6306458752d27c80edaef3560b7e81931 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Tue, 28 Sep 2010 18:52:04 -0700 Subject: [PATCH 099/246] GRG90C Change-Id: Ic75a0917b4bd1790695ec8bf61d33bfba0c5c195 --- 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 04b28a7fb..c38b5b345 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=GRG90B +export BUILD_ID=GRG90C From 4008379a6ac2a2c05e4cd4f04a7cd01df6c32779 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Sep 2010 07:13:50 -0700 Subject: [PATCH 100/246] GRG91 Change-Id: I7f6db3e3ecde47256d2c0f03f228077fd3b904fd --- 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 c38b5b345..fe0b59a59 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=GRG90C +export BUILD_ID=GRG91 From dd25c7c372db199e48cdfb2b92e2a84bbe5e5d07 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Wed, 29 Sep 2010 18:43:04 -0700 Subject: [PATCH 101/246] GRG91B Change-Id: Ifccdf3b3657b7c0c6d58684cb211d1d7712205ab --- 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 fe0b59a59..664c98cb1 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=GRG91 +export BUILD_ID=GRG91B From 967d037544682f627eb84af80c8f9458f2873fda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Sep 2010 07:11:12 -0700 Subject: [PATCH 102/246] GRG92 Change-Id: Ic64eabc22bd3a0a33bf7a0bce798ebfc8a4a59ec --- 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 664c98cb1..e11aeacf1 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=GRG91B +export BUILD_ID=GRG92 From 9e04e86037f2477f540f991626458df940b515fb Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 30 Sep 2010 16:03:21 -0700 Subject: [PATCH 103/246] GRG92B Change-Id: Ibbe42b603d25775b1c76bb49caadf3f092ae0246 --- 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 e11aeacf1..fd8e2be09 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=GRG92 +export BUILD_ID=GRG92B From 5dfc881272a8e5ef74406aae68d50ec0e4054e2c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 Oct 2010 07:18:12 -0700 Subject: [PATCH 104/246] GRH01 Change-Id: If100c337665eb374089765d744da282c758f6d78 --- 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 fd8e2be09..85df4fb13 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=GRG92B +export BUILD_ID=GRH01 From 644ceacfb62b5012bca49d6312b419005e5bc987 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 1 Oct 2010 15:56:46 -0700 Subject: [PATCH 105/246] GRH01B Change-Id: Id30665e572fa75051a0894d369bfb45be963a4dc --- 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 85df4fb13..8d3140c23 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=GRH01 +export BUILD_ID=GRH01B From d47604cd7a4741db75278a700e6387360f5e4f76 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 Oct 2010 07:14:29 -0700 Subject: [PATCH 106/246] GRH04 Change-Id: I9a620f65872d3773c7c5fbf110c1cff9d1535eca --- 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 8d3140c23..97bba3400 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=GRH01B +export BUILD_ID=GRH04 From a6a4efc03f3a0dad860986ab8710df0dcc63c648 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Mon, 4 Oct 2010 15:22:30 -0700 Subject: [PATCH 107/246] GRH04B Change-Id: I3489a30b61367cda3cd5723e1721e7e3dc5012df --- 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 97bba3400..639660d73 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=GRH04 +export BUILD_ID=GRH04B From ba73f8e508125504f6c261272049b67d687a135a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Oct 2010 07:13:24 -0700 Subject: [PATCH 108/246] GRH05 Change-Id: I07bbbe0ac217165f8562e621dc06435f799264e6 --- 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 639660d73..b1c09f571 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=GRH04B +export BUILD_ID=GRH05 From 7db5c908c91bf877c218a3e81f5e02b823d5adab Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Tue, 5 Oct 2010 09:02:55 -0700 Subject: [PATCH 109/246] GRH05B Change-Id: Ibd2252d06876fa5dfb1c11be1dba0da89976df20 --- 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 b1c09f571..c6d122a4b 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=GRH05 +export BUILD_ID=GRH05B From 7d0b1dc3a03b5ef05353fd6478a9eb480d3861ea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Oct 2010 07:49:42 -0700 Subject: [PATCH 110/246] GRH06 Change-Id: I3a713bf9d04620f6aaa14934bb6824b575b87732 --- 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 c6d122a4b..2915a2b12 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=GRH05B +export BUILD_ID=GRH06 From 92e7b7b07c94e14c57fc307eafbea640f6b3ffc9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Oct 2010 19:17:40 -0700 Subject: [PATCH 111/246] GRH06B Change-Id: Icae81c436b61ae341433554b596a0b0f22363d3c --- 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 2915a2b12..c9d4ee22e 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=GRH06 +export BUILD_ID=GRH06B From 3940b8845962837ad9bf56c2dfbffe0a45b499a3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Oct 2010 07:12:39 -0700 Subject: [PATCH 112/246] GRH07 Change-Id: I7dcfb737fdd789aaa0e27d1ca1e32bac871934ae --- 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 c9d4ee22e..eff17f3df 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=GRH06B +export BUILD_ID=GRH07 From c6350a1c6f8acbf9f9a17d6b1549c9b8c72fc2bf Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 7 Oct 2010 16:02:24 -0700 Subject: [PATCH 113/246] GRH07B Change-Id: I7b5774acb0b1f0360d98dcd411141fb37ff48eb2 --- 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 eff17f3df..75b31f24d 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=GRH07 +export BUILD_ID=GRH07B From 85fcc228a9e1e22b56a16fed789092daa3b434dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Oct 2010 09:06:02 -0700 Subject: [PATCH 114/246] GRH08 Change-Id: I069f06318d2ff0d49c6bb87e37500d15959c44f2 --- 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 75b31f24d..20f98fefc 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=GRH07B +export BUILD_ID=GRH08 From 7904b93a7b42b4e19fd58a1b80492b2a61eefd41 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Oct 2010 17:15:42 -0700 Subject: [PATCH 115/246] GRH08B Change-Id: I22675409218d41de3f9c0900ee77dafa7d955198 --- 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 20f98fefc..632f41a8e 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=GRH08 +export BUILD_ID=GRH08B From a891cbac50a9d59bd2d832fa3c3fc09e9e94f39d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 10 Oct 2010 16:37:31 -0700 Subject: [PATCH 116/246] GRH10 Change-Id: If9aa7efe7cfb0c1c2591779eed4ddf1be6f53a6f --- 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 632f41a8e..f2b4ce95f 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=GRH08B +export BUILD_ID=GRH10 From e95a97f306af3d2eed52d266ab6b7323acfa8ea0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Oct 2010 07:16:06 -0700 Subject: [PATCH 117/246] GRH11 Change-Id: I50696e1322860f649c8357c97fede7b68519ab10 --- 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 f2b4ce95f..7c884297d 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=GRH10 +export BUILD_ID=GRH11 From cb0084ec674fbb9467490a336a1857db6b90c02a Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Mon, 11 Oct 2010 16:40:41 -0700 Subject: [PATCH 118/246] GRH11B Change-Id: I8472a27d437c477e6ae6bd3e740392f933e19938 --- 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 7c884297d..5324d1d6f 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=GRH11 +export BUILD_ID=GRH11B From 739573ed96cdf79ec1118e3abe8d64835fe09f82 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Tue, 12 Oct 2010 07:46:00 -0700 Subject: [PATCH 119/246] GRH12 Change-Id: Ib999acd328ce6d495ef8f742d7ca4200672d0ef6 --- 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 5324d1d6f..db50fceed 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=GRH11B +export BUILD_ID=GRH12 From 4203222e6c5f8c550821d7b59179902bfa4bdf44 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Oct 2010 07:03:33 -0700 Subject: [PATCH 120/246] GRH13 Change-Id: Idf194606c0a6227a571e4f1a28b61cf20ae04975 --- 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 db50fceed..a07bec5bb 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=GRH12 +export BUILD_ID=GRH13 From 6ede7b8bf281f9d500691b45da6941d8dd22c87a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Oct 2010 18:50:03 -0700 Subject: [PATCH 121/246] GRH13B Change-Id: I79a455005d01ae300558074d1aa818bfbc61a6e3 --- 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 a07bec5bb..8384a071c 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=GRH13 +export BUILD_ID=GRH13B From 3afc8ea36359a4b388c4048e488db01361316b20 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Oct 2010 12:55:29 -0700 Subject: [PATCH 122/246] GRH14 Change-Id: I1668fd8ecf94a8b89d63f4478cbcb664a153b659 --- 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 8384a071c..9a0d06794 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=GRH13B +export BUILD_ID=GRH14 From 52f41d1112cba79950c77b18deff4e3ea6e29b58 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Oct 2010 12:57:02 -0700 Subject: [PATCH 123/246] GRH14B Change-Id: Icdde5d0dde16bc95fd54b1b01d785b151f5ee710 --- 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 9a0d06794..904b1376d 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=GRH14 +export BUILD_ID=GRH14B From 66634acbd0ef51ceb1c13a93cfaf6c99a6513d28 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Oct 2010 09:07:17 -0700 Subject: [PATCH 124/246] GRH15 Change-Id: Id3f7d7cc4542dc131cef21f0f7928e3ab51221a1 --- 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 904b1376d..763db4cd0 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=GRH14B +export BUILD_ID=GRH15 From 718b199bbb3dedd3a11489ce70a605892c80c734 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 15 Oct 2010 14:39:29 -0700 Subject: [PATCH 125/246] GRH15B Change-Id: Ic7f79b482f69e5db29d087587316dc076494f3fe --- 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 763db4cd0..c9c4ee5d5 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=GRH15 +export BUILD_ID=GRH15B From 40666083da054300d2dd7fc7ae66921c6a3ba734 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 15 Oct 2010 17:00:17 -0700 Subject: [PATCH 126/246] GRH15C Change-Id: Id3dff242dec3ebf8c4bb4f39729323f489915603 --- 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 c9c4ee5d5..43e50c3cf 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=GRH15B +export BUILD_ID=GRH15C From 69ad65f666603df2c9353ffb4d843b7b20cdbb13 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Oct 2010 08:28:46 -0700 Subject: [PATCH 127/246] GRH18 Change-Id: I76e1c8a71873e477057eea7ce684afa3ed09a08f --- 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 43e50c3cf..f69f83279 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=GRH15C +export BUILD_ID=GRH18 From 79755a3fb31c862a6cd53be50de7db62ecd16fcd Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Mon, 18 Oct 2010 17:25:04 -0700 Subject: [PATCH 128/246] GRH18B Change-Id: I92fa1ad11ef1b938780512ef198b13361f5bb0c1 --- 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 f69f83279..41347b261 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=GRH18 +export BUILD_ID=GRH18B From 2b3e88dc8a2a6121a43db6faf8dd28a93b525ec0 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Mon, 18 Oct 2010 17:38:59 -0700 Subject: [PATCH 129/246] GRH18C Change-Id: I8a348d98633a0958c2cb86d82de527d5fc51c8d7 --- 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 41347b261..3906fc6fc 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=GRH18B +export BUILD_ID=GRH18C From 00b94f6242511f421a283e6496ac3312053629bf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Oct 2010 07:40:55 -0700 Subject: [PATCH 130/246] GRH19 Change-Id: Ib99ea6f431606918d42a1cf26ab3c8f22ee118c6 --- 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 3906fc6fc..538005768 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=GRH18C +export BUILD_ID=GRH19 From 916ecb213bcaff22f6ec5880a43424eda17f4621 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Oct 2010 07:29:49 -0700 Subject: [PATCH 131/246] GRH20 Change-Id: Ic28dc803759054f0a7d940e5039feb9562a38377 --- 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 538005768..46a760352 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=GRH19 +export BUILD_ID=GRH20 From 4166df8fcb6ff45ce3cb0ea15d6d53694fdc206c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Oct 2010 12:46:44 -0700 Subject: [PATCH 132/246] GRH20B Change-Id: Ibc76f92280bb5db2013b6dccf8d85024e10c0ba1 --- 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 46a760352..041b185eb 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=GRH20 +export BUILD_ID=GRH20B From e7810746749bdfc2cef8b129ea764d3ee5c63d64 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Oct 2010 07:24:20 -0700 Subject: [PATCH 133/246] GRH21 Change-Id: I1646227a3efed4bcbd3f5d0d5c5dc52116f04c15 --- 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 041b185eb..f1d2b6a51 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=GRH20B +export BUILD_ID=GRH21 From db7b5b57272eb9cb485168dd66c71f36b817fd41 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 22 Oct 2010 14:53:19 -0700 Subject: [PATCH 134/246] GRH21B Change-Id: Ib1ce8e055c6b8cea331409a12abd3ff663483c96 --- 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 f1d2b6a51..12ba0d7bd 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=GRH21 +export BUILD_ID=GRH21B From ed45abea20a88e81ba3e2d2399528dbe7441ceef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Oct 2010 17:06:05 -0700 Subject: [PATCH 135/246] GRH22 Change-Id: I4b0488beb96d816cb8ebc63e00832cae13411188 --- 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 12ba0d7bd..b2d738c1b 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=GRH21B +export BUILD_ID=GRH22 From 32bef4b80e7a943076ea995696032cb5891e2f30 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Fri, 22 Oct 2010 17:19:33 -0700 Subject: [PATCH 136/246] GRH22B Change-Id: I73e460342961c8e75be6bf765a9fa914ac3148b5 --- 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 b2d738c1b..c27ce81a5 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=GRH22 +export BUILD_ID=GRH22B From 01fb0883e83c00df40514a2bbc92c01d5bf0697c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 24 Oct 2010 18:56:36 -0700 Subject: [PATCH 137/246] GRH24 Change-Id: I824b0de10d0738af056580386ed55b24975e78ce --- 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 c27ce81a5..86b8d6bff 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=GRH22B +export BUILD_ID=GRH24 From 571f7b9b3aaa06b50b9a9a8dddf3da50c9504573 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Oct 2010 11:28:28 -0700 Subject: [PATCH 138/246] GRH25 Change-Id: I8968fa320a3721d25a0e7a6b313edb3d92f9588b --- 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 86b8d6bff..48eff3b1b 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=GRH24 +export BUILD_ID=GRH25 From 4c194d41ed3f96d42d9cdfdad3c42ce073446724 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Oct 2010 21:22:00 -0700 Subject: [PATCH 139/246] GRH25B Change-Id: I6be54e4cd9d9e138d234702829e69c7149e3529e --- 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 48eff3b1b..6d010cf51 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=GRH25 +export BUILD_ID=GRH25B From c01f7d96f6e5640665db54b5012eb8f644d79960 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Oct 2010 17:11:43 -0700 Subject: [PATCH 140/246] GRH26 Change-Id: I1e461e91ee633830081082363d1eb6f45dc14275 --- 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 6d010cf51..0b09f61d6 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=GRH25B +export BUILD_ID=GRH26 From 12607ca7083c1a7eed52c331c53c39b1aaca0d3b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Oct 2010 22:23:20 -0700 Subject: [PATCH 141/246] GRH26B Change-Id: Ibfcf3bee4b46416b37f7a26af81810e00b177a89 --- 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 0b09f61d6..15f7bf8b7 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=GRH26 +export BUILD_ID=GRH26B From 2d9cb33c9cb38d7a9814b30dec447909b6942d4e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Oct 2010 12:25:47 -0700 Subject: [PATCH 142/246] GRH28 Change-Id: I5665c46137ab31f0b753cc01cb03663e9d391cc5 --- 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 15f7bf8b7..3a368a368 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=GRH26B +export BUILD_ID=GRH28 From 5eec80883478e3026cf893b1f839566ca4552257 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Oct 2010 20:23:39 -0700 Subject: [PATCH 143/246] GRH28B Change-Id: Id49448f70e70e3acca906867c17ce3d5720fa888 --- 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 3a368a368..ee5856e61 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=GRH28 +export BUILD_ID=GRH28B From dc7d1d33d217d381746426037853d0641daaa124 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Thu, 28 Oct 2010 21:50:05 -0700 Subject: [PATCH 144/246] GRH28C Change-Id: I584d860269afb63429295f9b4bf18ba5ba54c478 --- 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 ee5856e61..2b138168d 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=GRH28B +export BUILD_ID=GRH28C From 4d1d1cba1abc47cbeebdd3ba58729d3bc0174e20 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Oct 2010 21:37:53 -0700 Subject: [PATCH 145/246] GRH29 Change-Id: Ib4c410b7fe0c81cc16280969284b8437a3235d46 --- 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 2b138168d..a57d95668 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=GRH28C +export BUILD_ID=GRH29 From 36685b039f9718ab4c62e54d9cda6cfac2d230f4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Nov 2010 22:40:37 -0700 Subject: [PATCH 146/246] GRH32 Change-Id: If18a69659ee4aa8772cd1b0132bea7acc3615b5f --- 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 a57d95668..fc6fa8091 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=GRH29 +export BUILD_ID=GRH32 From c1c369ccd7898508df9c16b334ae0a4747a275d6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Nov 2010 02:52:33 -0700 Subject: [PATCH 147/246] GRH34 Change-Id: I663acf81dfceaea5a0d9f7b814ae85f07c402582 --- 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 fc6fa8091..d96730c5e 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=GRH32 +export BUILD_ID=GRH34 From 3b4525afe0da60a8a4dfbaa5825ffdd656ba173f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Nov 2010 00:04:27 -0700 Subject: [PATCH 148/246] GRH35 Change-Id: If31ec945f7180a6ec895ed60dba8813b0cd654cd --- 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 d96730c5e..1f19f336d 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=GRH34 +export BUILD_ID=GRH35 From 363314ff44d2cc1bda34510771638abc64504ba2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Nov 2010 18:30:08 -0700 Subject: [PATCH 149/246] GRH36 Change-Id: I9a1191fc8986382c8c692106be82a857b0af056b --- 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 1f19f336d..a7eed9d63 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=GRH35 +export BUILD_ID=GRH36 From 5dfe266ca8c842d6a33a313485590e9190c770bb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Nov 2010 09:25:28 -0800 Subject: [PATCH 150/246] GRH41 Change-Id: Ic49e58f4aecb3b7f06fc0b6db8f5d3c686d31493 --- 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 a7eed9d63..1fa7f4cff 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=GRH36 +export BUILD_ID=GRH41 From 7551141c5376dc17b0b3e0ec8e1633eeb576e292 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Wed, 10 Nov 2010 10:37:14 -0800 Subject: [PATCH 151/246] GRH41B Change-Id: I2b0aaa91802ac2c47ac6107a9afc0b0c1d95dd8f --- 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 1fa7f4cff..655280b75 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=GRH41 +export BUILD_ID=GRH41B From e44359bb08ce59725a05ddeac3cb10e219003d07 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Nov 2010 22:05:39 -0800 Subject: [PATCH 152/246] GRH42 Change-Id: Ia86a05f62271c753c56537941a3d6e38ee951609 --- 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 655280b75..4ca68862f 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=GRH41B +export BUILD_ID=GRH42 From f168fcdfeccd24b85750248a3c0a4aeca28fce29 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Nov 2010 06:49:45 -0800 Subject: [PATCH 153/246] GRH43 Change-Id: I568e44b3b5319865da9addfd80846c497d74eb60 --- 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 4ca68862f..971cf1f5d 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=GRH42 +export BUILD_ID=GRH43 From e52ad2f0f9a3ee37b2644b24cff3cec4a7082ca5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Nov 2010 17:24:27 -0800 Subject: [PATCH 154/246] GRH46 Change-Id: I5306955ceb523fc1ec21eb3b969839c3d6c2184b --- 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 971cf1f5d..06950a6eb 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=GRH43 +export BUILD_ID=GRH46 From f15294ea067693a1e5cdc86506ff9cd937f55ebc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Nov 2010 21:12:25 -0800 Subject: [PATCH 155/246] GRH46B Change-Id: I68d84e244eddfe99c441c8928e993d2070143d06 --- 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 06950a6eb..ea895fae2 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=GRH46 +export BUILD_ID=GRH46B From c280f27f9185e9bb62fb18a53ac202b65fa58ad9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Nov 2010 16:02:44 -0800 Subject: [PATCH 156/246] GRH47 Change-Id: I40ef29c6861d2e143662b3532a6cdcd50f068d7f --- 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 ea895fae2..0d48e33ab 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=GRH46B +export BUILD_ID=GRH47 From a2e15f909bb18ff8661947529799371c31adae87 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Nov 2010 22:04:27 -0800 Subject: [PATCH 157/246] GRH47B Change-Id: Ifadc68ac2b20dda1b6fd51f8b03a5dd0ec9e0537 --- 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 0d48e33ab..d96f30517 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=GRH47 +export BUILD_ID=GRH47B From 0532488066e1753ffdb7b41b7a074c9d576e0be9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Nov 2010 20:17:59 -0800 Subject: [PATCH 158/246] GRH49 Change-Id: If2caeec1c4a2fc7f7d8f47b44dcefa5fa2bf3cfd --- 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 d96f30517..754ac89f3 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=GRH47B +export BUILD_ID=GRH49 From 35adb22e348d17405b6c057440d2df71b1f43900 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Mon, 22 Nov 2010 22:57:44 -0800 Subject: [PATCH 159/246] GRH53 Change-Id: Ic75a7ca761d08353c49d9733a778a9a8f0535b0e --- 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 754ac89f3..a3d4f5115 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=GRH49 +export BUILD_ID=GRH53 From 5975b0af1f3b293bfabec7af8b7fb93dfc2683c5 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Tue, 23 Nov 2010 15:15:31 -0800 Subject: [PATCH 160/246] GRH54 Change-Id: I755a50587f795379ddc298bfeea3dbd968d458a1 --- 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 a3d4f5115..38638c1cc 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=GRH53 +export BUILD_ID=GRH54 From 767fe69965a96f25e5fb063fb5b25fa47cadec09 Mon Sep 17 00:00:00 2001 From: android-build SharedAccount Date: Wed, 24 Nov 2010 11:10:15 -0800 Subject: [PATCH 161/246] GRH55 Change-Id: Id49dc9ab01fa99992cfa0451b4e9d0ca80fb67fb --- 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 38638c1cc..fdefe335c 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=GRH54 +export BUILD_ID=GRH55 From 48bab58dd7b5ab9129acd0c88980278b13e9e8c5 Mon Sep 17 00:00:00 2001 From: android-merger Date: Tue, 7 Dec 2010 22:57:18 -0800 Subject: [PATCH 162/246] GRH68 Change-Id: Idac04adfa9a399c9d3f875c08d90ea61511b2c3f --- 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 fdefe335c..3514bec7b 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=GRH55 +export BUILD_ID=GRH68 From baa99624be3f84f7334e619bebc0a56e6fc65158 Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 9 Dec 2010 10:49:06 -0800 Subject: [PATCH 163/246] GRH70 Change-Id: Idca5a2b53baab06509f1f37deb9ffc97b64320e2 --- 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 3514bec7b..d0cf238b7 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=GRH68 +export BUILD_ID=GRH70 From 266f48148c60a464eeaac3c0aad303862f4d839b Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 9 Dec 2010 10:50:19 -0800 Subject: [PATCH 164/246] 2.3.1 Change-Id: I3f1b2a63684f29afdffb246c2d329fa8aac0008a --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 93199c203..8217f4163 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.3 + PLATFORM_VERSION := 2.3.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From 76e50f4bd01606287d386001ce2ca31d6ca9be9d Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 9 Dec 2010 15:00:13 -0800 Subject: [PATCH 165/246] GRH70B = GRH70 + NPE fixes in Maps.apk Change-Id: I1c27cf39a1031d905faffa2ec14f0a1cffd2c19f --- 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 d0cf238b7..0fc8a3012 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=GRH70 +export BUILD_ID=GRH70B From bb505ed31e5b73e5b5a9130b2162f55b588f525d Mon Sep 17 00:00:00 2001 From: android-merger Date: Tue, 14 Dec 2010 14:37:12 -0800 Subject: [PATCH 166/246] GRH75 Change-Id: Ib941cd51df619a48a8cb81159b2cbd2de6e4094b --- 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 0fc8a3012..1b43cdfb1 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=GRH70B +export BUILD_ID=GRH75 From 1b0cfb7f6f490d0fab3d04d989d2726fea35613b Mon Sep 17 00:00:00 2001 From: android-merger Date: Wed, 15 Dec 2010 13:21:03 -0800 Subject: [PATCH 167/246] GRH76 Change-Id: Id9073e2103e2da00a4cfcb21012ced565cf8cb0d --- 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 1b43cdfb1..418645827 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=GRH75 +export BUILD_ID=GRH76 From 44904a9a6829539af000572d437eeacaed872991 Mon Sep 17 00:00:00 2001 From: Sriram Raman Date: Thu, 16 Dec 2010 17:37:44 -0500 Subject: [PATCH 168/246] GRH77 Change-Id: I2c8b8592b7098e20e76ada49201c8f96326456ac --- 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 418645827..dca721bb5 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=GRH76 +export BUILD_ID=GRH77 From 427a97b590604025a78db9a5922a5f2754c286e9 Mon Sep 17 00:00:00 2001 From: Sriram Raman Date: Fri, 17 Dec 2010 12:06:52 -0500 Subject: [PATCH 169/246] GRH78 Change-Id: Ie6ad143bd7cd4faf89526bdf90dad22b5b7b6ca7 --- 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 dca721bb5..bda96bc3b 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=GRH77 +export BUILD_ID=GRH78 From 9e9914d29a34d6e5314aa5597a4e66dbc207c77d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Dec 2010 08:31:58 -0800 Subject: [PATCH 170/246] GRH82 Change-Id: I41a6c3c6b01a85068b071f8b7934ce5d535d8474 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..8051f8abc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRH82 From ed36a01280466a4b61711b30302e2463f281f661 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Dec 2010 08:00:47 -0800 Subject: [PATCH 171/246] GRH83 Change-Id: I46ef41050de93d6a1c3ff71a502360712c23ed9f --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..a6bc9254e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRH83 From 3cd014d980021f1610fe2d2c7722babf561eb386 Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 23 Dec 2010 10:44:10 -0800 Subject: [PATCH 172/246] GRH84 Change-Id: Ic450ec858989dad64de19eb908a39510e2a27bb6 --- 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 a6bc9254e..3ca73979b 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=GRH83 +export BUILD_ID=GRH84 From 44ea13c5c8b7b65b788d950b253231b6f5ee0003 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Jan 2011 07:19:47 -0800 Subject: [PATCH 173/246] GRI04 Change-Id: Ia9a41aede11366c880666826693227c62c5d836a --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..f2655f01b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI04 From 63b9842e40d7f814dc3e39a3dc39b952535d76a1 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 4 Jan 2011 12:55:14 -0800 Subject: [PATCH 174/246] Don't prepend ./ before the dirs to be removed So that installclean can be done properly when OUT_DIR is set to an obsolute path, such as /buildbot/out_dirs/git_gingerbread. Bug: 3321625 Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df --- core/cleanbuild.mk | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/core/cleanbuild.mk b/core/cleanbuild.mk index cf25ce112..821b03a26 100644 --- a/core/cleanbuild.mk +++ b/core/cleanbuild.mk @@ -160,8 +160,6 @@ current_build_config := # The files/dirs to delete during an installclean. This includes the # non-common APPS directory, which may contain the wrong resources. -# Use "./" in front of the paths to avoid accidentally deleting random -# parts of the filesystem if any of the *_OUT vars resolve to blank. # # Deletes all of the files that change between different build types, # like "make user" vs. "make sdk". This lets you work with different @@ -174,28 +172,34 @@ current_build_config := # $ make -j8 sdk # installclean_files := \ - ./$(HOST_OUT)/obj/NOTICE_FILES \ - ./$(HOST_OUT)/sdk \ - ./$(PRODUCT_OUT)/*.img \ - ./$(PRODUCT_OUT)/*.txt \ - ./$(PRODUCT_OUT)/*.xlb \ - ./$(PRODUCT_OUT)/*.zip \ - ./$(PRODUCT_OUT)/data \ - ./$(PRODUCT_OUT)/obj/APPS \ - ./$(PRODUCT_OUT)/obj/NOTICE_FILES \ - ./$(PRODUCT_OUT)/obj/PACKAGING \ - ./$(PRODUCT_OUT)/recovery \ - ./$(PRODUCT_OUT)/root \ - ./$(PRODUCT_OUT)/system \ - ./$(PRODUCT_OUT)/dex_bootjars \ - ./$(PRODUCT_OUT)/obj/JAVA_LIBRARIES + $(HOST_OUT)/obj/NOTICE_FILES \ + $(HOST_OUT)/sdk \ + $(PRODUCT_OUT)/*.img \ + $(PRODUCT_OUT)/*.txt \ + $(PRODUCT_OUT)/*.xlb \ + $(PRODUCT_OUT)/*.zip \ + $(PRODUCT_OUT)/data \ + $(PRODUCT_OUT)/obj/APPS \ + $(PRODUCT_OUT)/obj/NOTICE_FILES \ + $(PRODUCT_OUT)/obj/PACKAGING \ + $(PRODUCT_OUT)/recovery \ + $(PRODUCT_OUT)/root \ + $(PRODUCT_OUT)/system \ + $(PRODUCT_OUT)/dex_bootjars \ + $(PRODUCT_OUT)/obj/JAVA_LIBRARIES # The files/dirs to delete during a dataclean, which removes any files # in the staging and emulator data partitions. dataclean_files := \ - ./$(PRODUCT_OUT)/data/* \ - ./$(PRODUCT_OUT)/data-qemu/* \ - ./$(PRODUCT_OUT)/userdata-qemu.img + $(PRODUCT_OUT)/data/* \ + $(PRODUCT_OUT)/data-qemu/* \ + $(PRODUCT_OUT)/userdata-qemu.img + +# make sure *_OUT is set so that we won't result in deleting random parts +# of the filesystem. +ifneq (2,$(words $(HOST_OUT) $(PRODUCT_OUT))) + $(error both HOST_OUT and PRODUCT_OUT should be set at this point.) +endif # Define the rules for commandline invocation. .PHONY: dataclean @@ -212,6 +216,7 @@ installclean: dataclean ifeq "$(force_installclean)" "true" $(info *** Forcing "make installclean"...) + $(info *** rm -rf $(dataclean_files) $(installclean_files)) $(shell rm -rf $(dataclean_files) $(installclean_files)) $(info *** Done with the cleaning, now starting the real build.) endif From be7d046fc6ab67bb9d1febed381048b8b0e6d3b2 Mon Sep 17 00:00:00 2001 From: Sriram Raman Date: Tue, 4 Jan 2011 21:04:01 -0500 Subject: [PATCH 175/246] GRI04B Change-Id: I9de8cf3331eab6719a42057cd9482e88537ec940 --- 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 f2655f01b..8d0649ab3 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=GRI04 +export BUILD_ID=GRI04B From 8b8ce05c7b3f10d9dacea8d4fae3104a7b1671a4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Jan 2011 07:34:02 -0800 Subject: [PATCH 176/246] GRI05 Change-Id: Ib10b09b6bc331edc5bd3a647104b7b0a1673abb7 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..68b8b062a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI05 From cec2f13886db60c6e778c8e59edacc81cca31a6b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Jan 2011 17:24:31 -0800 Subject: [PATCH 177/246] GRI06 Change-Id: Id46b46cd0a7b6ae0fe47139b2e0ba29790f19c85 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..9a7f62e75 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI06 From 827aae5a41db7368dae9ee76daf47d01bfc2c844 Mon Sep 17 00:00:00 2001 From: Sriram Raman Date: Thu, 6 Jan 2011 22:12:59 -0500 Subject: [PATCH 178/246] GRI06B Change-Id: I658d4d6ea34882867310b033e6b76fa67036d536 --- 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 9a7f62e75..32bcbec88 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=GRI06 +export BUILD_ID=GRI06B From dbf6f307ea291ed6bdeebf07816174b91f503d3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Jan 2011 07:39:59 -0800 Subject: [PATCH 179/246] GRI10 Change-Id: I33bea69141575bcadea2c429406f0de1b53d083f --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..4bdd8b842 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI10 From 16e8f1c84b25c13d1f8eb124223d8a177992fa69 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Jan 2011 07:34:54 -0800 Subject: [PATCH 180/246] GRI11 Change-Id: I8cad7593afb22398aa0bbfcca51602302834b72c --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..68c890e44 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI11 From 79e619a4923092fae28be4d0fe51104baf5ebb0b Mon Sep 17 00:00:00 2001 From: android-merger Date: Tue, 11 Jan 2011 10:03:03 -0800 Subject: [PATCH 181/246] GRI11B Change-Id: Icfe28b4bca6c45ee4b74d5f0c5db44c5b87c7266 --- 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 68c890e44..3ddd8a691 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=GRI11 +export BUILD_ID=GRI11B From 9b0a20189bd65763f3c6315532a9f728916acb01 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Jan 2011 07:21:06 -0800 Subject: [PATCH 182/246] GRI12 Change-Id: I1ed5206a23f913ed14ddb048b70ad2b981c05b00 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..4efac86e1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI12 From 7e65cd6bfa8372842e2ce05fe6184e15d0dd2624 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Jan 2011 07:48:23 -0800 Subject: [PATCH 183/246] GRI13 Change-Id: I1b9d5f33a02cfbec8150475c2f6d6f0de124abd5 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..9db6eb384 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI13 From 23dbcf670adefb96fc9da37c0d87bc9e7807fe5d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Jan 2011 07:48:56 -0800 Subject: [PATCH 184/246] GRI14 Change-Id: Ib6a65ca825d7dbb5cf8c30580d577d2fd3ef7030 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..367f61818 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI14 From fdb4bad8ce525ac54603260757ae0f261d065aa0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 16 Jan 2011 08:53:56 -0800 Subject: [PATCH 185/246] GRI16 Change-Id: I1ca93b0bddbff4e6ee6bbbf4f490b8f5a97ad8c5 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..a5ee60110 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI16 From 7b8d8e536f83e62268257d2f31a2e6b9caf89285 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 16 Jan 2011 16:22:08 -0800 Subject: [PATCH 186/246] GRI16B Change-Id: I92f45346261450ef7534ef8857256f5b14fa5177 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..ab8eac37f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI16B From c92fe6d6c2d55a85040edf1d21810d64d882ca16 Mon Sep 17 00:00:00 2001 From: android-merger Date: Sun, 16 Jan 2011 22:06:15 -0800 Subject: [PATCH 187/246] GRH78B Change-Id: If073900c338d3cc0efa13564315c9b62daaff7e4 --- 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 bda96bc3b..33082308a 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=GRH78 +export BUILD_ID=GRH78B From 81056a1c2bf8d42a9ca70eee90bb04e268dcddb1 Mon Sep 17 00:00:00 2001 From: android-merger Date: Wed, 19 Jan 2011 23:15:07 -0800 Subject: [PATCH 188/246] update "both" versions! Change-Id: Ib5c56161ab00b20f6215960d225dc7fea83f3282 --- core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 33082308a..6e62c6df8 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=GRH78B +export BUILD_ID=GRH78C diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8217f4163..dc07ad5c5 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.3.1 + PLATFORM_VERSION := 2.3.2 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From cdf1888cde55d6d1fc663fe8a2fb4de2e7816e65 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Jan 2011 17:21:02 -0800 Subject: [PATCH 189/246] GRI20 Change-Id: I0a2fcb365493cc5cd878819945abb4acb0e4ed59 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..b26a6e0d0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI20 From 1943f3fd023337603ef9ee390078e9d5c7a1fa04 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Jan 2011 15:13:08 -0800 Subject: [PATCH 190/246] GRI26 Change-Id: Iee0d10cb3330ebbbc9384d8bc0c972ebb8adb662 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..6dd665a14 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI26 From 2125ea8ccb39fa2b812e4c491e5183c04a3b1eac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Jan 2011 18:55:34 -0800 Subject: [PATCH 191/246] GRI26B Change-Id: Ib7e2c85985df1efe54d542f1a85619c24c713509 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..ec52b22f1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI26B From 464ec9731ff01202b8e2d6f4ab0c0034ac19c1f2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Jan 2011 14:45:17 -0800 Subject: [PATCH 192/246] GRI28 Change-Id: Ibfee5c01c8dfc78cbf8e2a06feb9348b9263c25d --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..82ec73a07 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI28 From 0bd33ee4ab757f142fabd68c0abed83116af0f6c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 30 Jan 2011 16:03:26 -0800 Subject: [PATCH 193/246] GRI30 Change-Id: Ifb11e4a3f511fa53b6dd6c5e4caf6f503677faa3 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..e3fdffbfb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI30 From 4b15a6f2035d83021905c27953e018bca3cfa4cc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Feb 2011 18:29:39 -0800 Subject: [PATCH 194/246] GRI33 Change-Id: Ic3dc25764715f2b758259e29a6ee83f0c1612e8d --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..066ca4d4b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI33 From fca66ac564438985388d502f6e4b20de08ae8212 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Feb 2011 14:24:10 -0800 Subject: [PATCH 195/246] GRI34 Change-Id: I1a01e036d32901189a89f6461d71ff62fd8aea73 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..d19da7dbe 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI34 From 91e9bd221bbea66df86ff094e57de875fdfeaec2 Mon Sep 17 00:00:00 2001 From: android-merger Date: Tue, 8 Feb 2011 13:59:39 -0800 Subject: [PATCH 196/246] GRI39 Change-Id: I0b0cae4d75e86c7472814dd9832caa976eda9783 --- 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 d19da7dbe..d6dd6d10b 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=GRI34 +export BUILD_ID=GRI39 From 6f7a6ac0e92c0b33070adac84b714cbd67929c96 Mon Sep 17 00:00:00 2001 From: android-merger Date: Wed, 9 Feb 2011 17:57:48 -0800 Subject: [PATCH 197/246] GRI40 Change-Id: I8c83ec1dc66cace5e69cdd1a2a81db2bfbe00b96 --- 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 d6dd6d10b..f77e3348f 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=GRI39 +export BUILD_ID=GRI40 From b0326601cd60d2d209a8df7f9e17c9314b54dcd4 Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 11 Feb 2011 15:15:17 -0800 Subject: [PATCH 198/246] GRI42 Change-Id: I34f1e58d731f74d8509d354669cccd531b0dd8d4 --- 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 f77e3348f..211a4bd34 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=GRI40 +export BUILD_ID=GRI42 From 8c8d12efb2830bf4b21842b8a4264403ec191a1c Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 18 Feb 2011 08:10:34 -0800 Subject: [PATCH 199/246] GRI49 Change-Id: I8af60ecccd73e25e273ed75ef6665e754e2b18c2 --- 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 211a4bd34..291cca122 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=GRI42 +export BUILD_ID=GRI49 From f487a02bf77f22e34c03cc8c66c189dd149ebf1c Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 18 Feb 2011 11:07:30 -0800 Subject: [PATCH 200/246] GRI49B Change-Id: I2954e5783283e87c852603dc3511c6b6bba4a282 --- 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 291cca122..3d9178f8f 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=GRI49 +export BUILD_ID=GRI49B From f7d3b83cf2ea0fbca66ee6ce6823034546e65e59 Mon Sep 17 00:00:00 2001 From: android-merger Date: Sat, 19 Feb 2011 16:11:15 -0800 Subject: [PATCH 201/246] GRI49C Change-Id: Id23fa869f4f3d7c1aa45284ce24b3593dc03a522 --- 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 3d9178f8f..0fcdf43de 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=GRI49B +export BUILD_ID=GRI49C From 94d2f1f12517792a612b352a0e10a197dc26177c Mon Sep 17 00:00:00 2001 From: android-merger Date: Wed, 23 Feb 2011 15:10:24 -0800 Subject: [PATCH 202/246] GRI54 Change-Id: Ib089f2fc920b01d4f98a1db2cbb88bfd6f1bbdd4 --- 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 0fcdf43de..7786397f2 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=GRI49C +export BUILD_ID=GRI54 From 1a5803245d34ffc60973882723e53a91cfa575f7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Mar 2011 14:17:53 -0800 Subject: [PATCH 203/246] GRI62 Change-Id: I5a2705b0234e9eac5170f0fc99cae733f0120ad7 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..0fbb03dad 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI62 From 8ba3d8ae3d6fcbb8aab825d524546edc9442b92a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 4 Mar 2011 17:42:12 -0800 Subject: [PATCH 204/246] GRI63 Change-Id: I89b9ce44fb606673eab107752eb9711815f45ae6 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..32e67c3f5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI63 From 66b6b5390e83f9d50b9ac7a041c4d4e57f5ea6c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 4 Mar 2011 21:56:47 -0800 Subject: [PATCH 205/246] GRI63B Change-Id: I247933cd417aedabf26d94b8e7323a7a492697de --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..1a2715ae2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI63B From c18c8594cef86d72cbb9f6fc713c6e64bed3603f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 7 Mar 2011 16:40:20 -0800 Subject: [PATCH 206/246] GRI66 Change-Id: I1f6709ea7aefafbc663b1f43667c67403f7e4b5e --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..fb10a10df 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI66 From 6925c5bcbe54ffde784ab49b7a0a19457a491b24 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 9 Mar 2011 08:54:15 -0800 Subject: [PATCH 207/246] GRI68 Change-Id: I6b352d645eacaf11aea9ac0a9567c4f5c9dab955 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..9f29dc3ab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI68 From 782b65559b861932a96f2b9101ebc3812bb55137 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 11 Mar 2011 10:36:03 -0800 Subject: [PATCH 208/246] GRI70 Change-Id: Ide85a7a7399834ff03052970be03ef20c06812bc --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..ba78f8a44 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI70 From ff3eddd4c4a705881db75d887aa1f4fbb7dfa551 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 12 Mar 2011 11:56:32 -0800 Subject: [PATCH 209/246] GRI71 Change-Id: Ifed7da49ef46eb7d1919b410538de304100388a7 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..246bc444d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI71 From c66a7b6b432afae1d5ed33d08b3d8a13d482c9c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 14 Mar 2011 22:34:06 -0700 Subject: [PATCH 210/246] GRI73 Change-Id: I229b4a1545033e023679e59891f45ee83d711c5b --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..3ec3348be 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI73 From 700b194bdffab2386d1653b8e2f3b9bd4c97e7f8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 16 Mar 2011 05:44:00 -0700 Subject: [PATCH 211/246] GRI75 Change-Id: Ib2065b8cd2383fb7e59bdb0eeb7f3d47ca9335dc --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..4faa221be 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI75 From 3b8308299301750c5442170249b7167c672a5359 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Mar 2011 05:44:08 -0700 Subject: [PATCH 212/246] GRI76 Change-Id: I90c73c1202ae5e83048e3b124e6169728c41784e --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..8bedf7bd7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI76 From 0427113f0f322962d831017d12dce4729857e057 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 18 Mar 2011 10:42:10 -0700 Subject: [PATCH 213/246] GRI77 Change-Id: Idbde2b12aaca1df187995ad6c0c03b0a15992b0d --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..13665e674 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI77 From e4693b872caf4084a0c7826b7853fdf794ab07a3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 18 Mar 2011 17:35:49 -0700 Subject: [PATCH 214/246] GRI77B Change-Id: Ib20660e0a4e29dfbebdc4c3aef06da4c7771a5a5 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..6b168abe8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI77B From 3035e22154faa038cd637d8e6bf7f52cd395df33 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Mar 2011 05:42:52 -0700 Subject: [PATCH 215/246] GRI80 Change-Id: I147615889d4c9d6648448aa88f95235ed85ad720 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..4cd478b6e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI80 From 9bae79d398ef3a0d584c5197389c73a69695ed7f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Mar 2011 05:43:50 -0700 Subject: [PATCH 216/246] GRI81 Change-Id: Id945d0ef9c887eac896a19943227750ddd0c5132 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..bc0771320 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI81 From dae59c1199ff1320703aa9d6169269b7bbee7aad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Mar 2011 13:10:47 -0700 Subject: [PATCH 217/246] GRI81B Change-Id: I3da48c23a15b29e4feb388432a7e65ec7d034a40 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..9d67a19e1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI81B From 48ff61e4eb2293a14b832fcd155cec098936aa2c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Mar 2011 05:43:40 -0700 Subject: [PATCH 218/246] GRI82 Change-Id: Ib3ab87e89806a559175d1cf7dfa7177d39a1e453 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..29850770e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI82 From e2860f7495f1e6bb32e066a5e713537dadb352d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 Mar 2011 08:49:24 -0700 Subject: [PATCH 219/246] GRI83 Change-Id: Icf7346d2fd48ce3620c342cb752f421b2e676871 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..d4b15f168 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI83 From bbe79b534670b330ae22b4ab2980b9cc182dcc76 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Mar 2011 06:05:02 -0700 Subject: [PATCH 220/246] GRI84 Change-Id: I34dd0c3772e3a50a53bbc6e1eebf204800c0d733 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..ecf5c67e3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI84 From 5f30281b18afc035bbe84a8d8365fda2569fbd46 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Mar 2011 14:32:48 -0700 Subject: [PATCH 221/246] GRI84B Change-Id: Ic0ac25ceec832c97c670ab1b3bf96afcfdec2f27 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..5f32cabd5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI84B From e84f43a2cbff7cc3dc86eb4471560ee0e87f8c38 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Mar 2011 22:26:09 -0700 Subject: [PATCH 222/246] GRI84C Change-Id: I2d005428d7998617eee3326ec100e0ee5623f0d4 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..e49441b78 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI84C From d7ea7be632573717f7338a7249f337bae5ee8a53 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Mar 2011 05:44:18 -0700 Subject: [PATCH 223/246] GRI87 Change-Id: I81d3c7a3d563a7bc37c51afbd4eac05819a4ad42 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..dd309916e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI87 From 0ea122da0e6561910f8442dbaacc2f5a1a8cfcf5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Mar 2011 16:31:32 -0700 Subject: [PATCH 224/246] GRI87B Change-Id: I9c4a72a9abe827c67b26c0225ade79e4d3e57cc7 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..97b77d834 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI87B From c1ea5d2621bed377dbb91cab88e50705bb16b602 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Mar 2011 18:33:08 -0700 Subject: [PATCH 225/246] GRI89 Change-Id: I49d20526f59d138207dc0f910c9963621604dcc4 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..0f2f98180 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRI89 From 7f393ddf70ae10aeba482101c2c60d265dc327b5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 Apr 2011 13:28:39 -0700 Subject: [PATCH 226/246] GRJ01 Change-Id: Ifac185d6a3aa4fa9d7486490acf6eded6ca05d9f --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..fea699b99 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRJ01 From 2ced6503fa506dc6a8a13ae6298d9d14d8ad787b Mon Sep 17 00:00:00 2001 From: android-merger Date: Wed, 6 Apr 2011 13:41:44 -0700 Subject: [PATCH 227/246] GRJ06 Change-Id: I5c400ad59e7a982a79bac91095157fec44569458 --- 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 fea699b99..7b075c42e 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=GRJ01 +export BUILD_ID=GRJ06 From f6bc28d03d3a75012839cde6d0db483849ce0c48 Mon Sep 17 00:00:00 2001 From: android-merger Date: Wed, 6 Apr 2011 15:13:37 -0700 Subject: [PATCH 228/246] GRJ06C Change-Id: I03ff8ac2d4c7e5edaa05b649d2ddaf226f8c118a modified: core/build_id.mk --- 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 7b075c42e..c44b5ec77 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=GRJ06 +export BUILD_ID=GRJ06C From 162e1b9319a995937f1c47d739c0574c857bcffe Mon Sep 17 00:00:00 2001 From: android-merger Date: Wed, 6 Apr 2011 17:46:20 -0700 Subject: [PATCH 229/246] GRJ06D Change-Id: I6737dfa3412c2b5243da7e70e7be280278e93d4b --- 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 c44b5ec77..ecad51509 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=GRJ06C +export BUILD_ID=GRJ06D From 8cc25956f1502d736dc2bcc3ba238c02f7297a5e Mon Sep 17 00:00:00 2001 From: android-merger Date: Mon, 18 Apr 2011 20:21:13 -0700 Subject: [PATCH 230/246] GRJ18 Change-Id: Ic678f32d80fb63535ce9b214eb7487d27ce1ecf0 --- 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 ecad51509..67f7d1e04 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=GRJ06D +export BUILD_ID=GRJ18 From 16101b8534867f8595025830e5264cd84628f4cb Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 22 Apr 2011 13:33:54 -0700 Subject: [PATCH 231/246] GRJ22 Change-Id: Icaedff8a1d030a3158d54432b67ab7bfbf652e87 --- 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 67f7d1e04..fed19c9ad 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=GRJ18 +export BUILD_ID=GRJ22 From 03300e0d49aada3eaadf4b3d745ed1ffa82a4450 Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 5 May 2011 13:07:24 -0700 Subject: [PATCH 232/246] GRJ35 Change-Id: I6cc9e3c61eef4cb56142fdfe6f7cac3434f81a7b --- 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 fed19c9ad..e1a84722a 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=GRJ22 +export BUILD_ID=GRJ35 From b31afbf42a28aac19de78dd64d7af8adfffe11d7 Mon Sep 17 00:00:00 2001 From: "T.R. Fullhart" Date: Mon, 9 May 2011 17:54:01 -0700 Subject: [PATCH 233/246] GRJ39 Change-Id: Ia991a6c0512267d7928747cd41900201f8785879 --- 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 e1a84722a..2dbfd1e17 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=GRJ35 +export BUILD_ID=GRJ39 From 83270c17136e05028d3d65d00b90bf2fcd808f5e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 13 May 2011 14:27:49 -0700 Subject: [PATCH 234/246] GRJ43 Change-Id: I17c44f6b0635c30509d8c91e16ee6dcfc6f12a6f --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..942b0fdb4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRJ43 From 9e7de6792f6343f246e12a53f33a297aa67d6723 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 May 2011 16:14:27 -0700 Subject: [PATCH 235/246] GRJ55 Change-Id: Ie75ba136457e19223f1a0ca3be7dba1379e9f20f --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..8fc62a69e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRJ55 From 741b7c37075aff8585a46475583bc42c59477e91 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 May 2011 21:28:36 -0700 Subject: [PATCH 236/246] GRJ56 Change-Id: I82f3b91ab1b876bd942ef43959fe978949c95bbc --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..5ab0a9ad7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRJ56 From d36847bbcea471c1e0d5d68d34647cd57d1cffb9 Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 26 May 2011 21:46:56 -0700 Subject: [PATCH 237/246] GRJ56B Change-Id: If91d5be2c6eb6a28e5e46688f10c34bd0fb47b93 --- 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 5ab0a9ad7..3b65f6df6 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=GRJ56 +export BUILD_ID=GRJ56B From a4652dbd8db27468c24ae478e2b189b6bccd1559 Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 27 May 2011 14:35:35 -0700 Subject: [PATCH 238/246] GRJ57 Change-Id: I88bed3c222969a0fa5f6bfa5510772ab47cb68a3 --- 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 3b65f6df6..714947d07 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=GRJ56B +export BUILD_ID=GRJ57 From 44d569d11aff06cf49db74bfeac708e33a25257e Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 27 May 2011 14:54:02 -0700 Subject: [PATCH 239/246] GRJ57B Change-Id: I6a8c336ae35c80128b2c2c7218daa39b7cb226b0 --- 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 714947d07..90dea2551 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=GRJ57 +export BUILD_ID=GRJ57B From dfff9cd9bb5ce8e1959962294754bc1d777fec84 Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Tue, 31 May 2011 14:05:14 -0700 Subject: [PATCH 240/246] GT the gingerbread-mr2-release branch Change-Id: I22d6f9759fada4d7970dc915119345eb3fba24d4 --- 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 fed19c9ad..2c23e0b0b 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=GRJ22 +export BUILD_ID=GTJ61 From c05f729be7e700b8737e3047d2eaca71b94d3a81 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Jun 2011 15:00:39 -0700 Subject: [PATCH 241/246] GRJ67 Change-Id: I034d285ebaaa4e88f08c1f29cdbf41f837d9aeb3 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..5327f753e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRJ67 From 853d146585b8f0c0820f21a9d6b607efa11e156e Mon Sep 17 00:00:00 2001 From: android-merger Date: Mon, 6 Jun 2011 15:18:47 -0700 Subject: [PATCH 242/246] GRJ67B Change-Id: I73742ebdf6e60ddf7fe40605e4f50b7188e082b9 --- 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 5327f753e..1be96ddfd 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=GRJ67 +export BUILD_ID=GRJ67B From 675b73417db97663773699dc3f4f6dfb38509b6d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Jun 2011 13:45:46 -0700 Subject: [PATCH 243/246] GRJ70 Change-Id: If43e3bcca9e61825d1a7f3287b233d1e9f5e32ad --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..5e8358353 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRJ70 From 28966abd44bb3b26c8856212b505f17d513bb265 Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 9 Jun 2011 13:55:16 -0700 Subject: [PATCH 244/246] GRJ70B Change-Id: I4142cfae1378d46c6ee9ae795bcf21af91039505 --- 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 5e8358353..f63a3e8ec 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=GRJ70 +export BUILD_ID=GRJ70B From f78c2d0166047d1f797ae475af72a8024413a49d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Jun 2011 14:57:26 -0700 Subject: [PATCH 245/246] GRJ71 Change-Id: I7d5674396d8792e21cc3b39532abf895b48f46a0 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b7b0e42e..b6c7496c8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # 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 +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := GINGERBREAD -# 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=GRJ71 From 470770bc763d5dc64478e83ddcb053ae2f5a43e1 Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 10 Jun 2011 15:04:31 -0700 Subject: [PATCH 246/246] GRJ71B Change-Id: I7cc782c78cf18df07949011ef9427063cafa3c94 --- 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 b6c7496c8..1b43e606b 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=GRJ71 +export BUILD_ID=GRJ71B