OSDN Git Service
android-merger [Thu, 20 Jan 2011 07:53:57 +0000 (23:53 -0800)]
Merge branch 'gingerbread-release' into saved-gingerbread-release
android-merger [Thu, 20 Jan 2011 07:15:07 +0000 (23:15 -0800)]
update "both" versions!
Change-Id: Ib5c56161ab00b20f6215960d225dc7fea83f3282
android-merger [Wed, 19 Jan 2011 22:12:16 +0000 (14:12 -0800)]
Merge branch 'gingerbread-release' into saved-gingerbread-release
android-merger [Mon, 17 Jan 2011 06:06:15 +0000 (22:06 -0800)]
GRH78B
Change-Id: If073900c338d3cc0efa13564315c9b62daaff7e4
The Android Automerger [Mon, 17 Jan 2011 00:22:08 +0000 (16:22 -0800)]
GRI16B
Change-Id: I92f45346261450ef7534ef8857256f5b14fa5177
The Android Automerger [Mon, 17 Jan 2011 00:22:02 +0000 (16:22 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sun, 16 Jan 2011 16:53:56 +0000 (08:53 -0800)]
GRI16
Change-Id: I1ca93b0bddbff4e6ee6bbbf4f490b8f5a97ad8c5
The Android Automerger [Sun, 16 Jan 2011 16:53:38 +0000 (08:53 -0800)]
merge in gingerbread-release history after reset to gingerbread
Jean-Baptiste Queru [Fri, 14 Jan 2011 21:27:31 +0000 (13:27 -0800)]
Merge from open-source gingerbread
Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
Jean-Baptiste Queru [Fri, 14 Jan 2011 20:46:35 +0000 (12:46 -0800)]
Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread
The Android Automerger [Fri, 14 Jan 2011 15:48:56 +0000 (07:48 -0800)]
GRI14
Change-Id: Ib6a65ca825d7dbb5cf8c30580d577d2fd3ef7030
The Android Automerger [Fri, 14 Jan 2011 15:48:48 +0000 (07:48 -0800)]
merge in gingerbread-release history after reset to gingerbread
Scott Main [Fri, 14 Jan 2011 00:35:51 +0000 (16:35 -0800)]
docs: update the sdk doc template to remove a bunch of obsolete
things and clean up the logic statements for clarity
Change-Id: I75d333370d9e7135abda96c4ef50800f287cea97
The Android Automerger [Thu, 13 Jan 2011 15:48:23 +0000 (07:48 -0800)]
GRI13
Change-Id: I1b9d5f33a02cfbec8150475c2f6d6f0de124abd5
The Android Automerger [Thu, 13 Jan 2011 15:48:17 +0000 (07:48 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 12 Jan 2011 15:21:06 +0000 (07:21 -0800)]
GRI12
Change-Id: I1ed5206a23f913ed14ddb048b70ad2b981c05b00
The Android Automerger [Wed, 12 Jan 2011 15:20:58 +0000 (07:20 -0800)]
merge in gingerbread-release history after reset to gingerbread
android-merger [Tue, 11 Jan 2011 18:03:03 +0000 (10:03 -0800)]
GRI11B
Change-Id: Icfe28b4bca6c45ee4b74d5f0c5db44c5b87c7266
The Android Automerger [Tue, 11 Jan 2011 15:34:54 +0000 (07:34 -0800)]
GRI11
Change-Id: I8cad7593afb22398aa0bbfcca51602302834b72c
The Android Automerger [Tue, 11 Jan 2011 15:34:47 +0000 (07:34 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 10 Jan 2011 15:39:59 +0000 (07:39 -0800)]
GRI10
Change-Id: I33bea69141575bcadea2c429406f0de1b53d083f
The Android Automerger [Mon, 10 Jan 2011 15:39:45 +0000 (07:39 -0800)]
merge in gingerbread-release history after reset to gingerbread
Brett Chabot [Tue, 14 Dec 2010 22:45:08 +0000 (14:45 -0800)]
CTS: pass vogar expectation location to CollectAllTests.
Bug
3181338
Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
Sriram Raman [Fri, 7 Jan 2011 03:12:59 +0000 (22:12 -0500)]
GRI06B
Change-Id: I658d4d6ea34882867310b033e6b76fa67036d536
The Android Automerger [Fri, 7 Jan 2011 01:24:31 +0000 (17:24 -0800)]
GRI06
Change-Id: Id46b46cd0a7b6ae0fe47139b2e0ba29790f19c85
The Android Automerger [Fri, 7 Jan 2011 01:24:20 +0000 (17:24 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 5 Jan 2011 15:34:02 +0000 (07:34 -0800)]
GRI05
Change-Id: Ib10b09b6bc331edc5bd3a647104b7b0a1673abb7
The Android Automerger [Wed, 5 Jan 2011 15:33:57 +0000 (07:33 -0800)]
merge in gingerbread-release history after reset to gingerbread
Sriram Raman [Wed, 5 Jan 2011 02:04:01 +0000 (21:04 -0500)]
GRI04B
Change-Id: I9de8cf3331eab6719a42057cd9482e88537ec940
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
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
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
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
The Android Automerger [Tue, 4 Jan 2011 15:19:47 +0000 (07:19 -0800)]
GRI04
Change-Id: Ia9a41aede11366c880666826693227c62c5d836a
The Android Automerger [Tue, 4 Jan 2011 15:19:41 +0000 (07:19 -0800)]
merge in gingerbread-release history after reset to gingerbread
android-merger [Thu, 23 Dec 2010 18:44:10 +0000 (10:44 -0800)]
GRH84
Change-Id: Ic450ec858989dad64de19eb908a39510e2a27bb6
The Android Automerger [Wed, 22 Dec 2010 16:00:47 +0000 (08:00 -0800)]
GRH83
Change-Id: I46ef41050de93d6a1c3ff71a502360712c23ed9f
The Android Automerger [Wed, 22 Dec 2010 16:00:41 +0000 (08:00 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 21 Dec 2010 16:31:58 +0000 (08:31 -0800)]
GRH82
Change-Id: I41a6c3c6b01a85068b071f8b7934ce5d535d8474
The Android Automerger [Tue, 21 Dec 2010 16:31:43 +0000 (08:31 -0800)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Mon, 20 Dec 2010 19:18:28 +0000 (11:18 -0800)]
Use PRIVATE_CXX in HOST modules.
This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578
Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9
Sriram Raman [Fri, 17 Dec 2010 17:06:52 +0000 (12:06 -0500)]
GRH78
Change-Id: Ie6ad143bd7cd4faf89526bdf90dad22b5b7b6ca7
Sriram Raman [Thu, 16 Dec 2010 22:37:44 +0000 (17:37 -0500)]
GRH77
Change-Id: I2c8b8592b7098e20e76ada49201c8f96326456ac
Jeff Hamilton [Thu, 16 Dec 2010 00:29:40 +0000 (18:29 -0600)]
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de
android-merger [Wed, 15 Dec 2010 21:21:03 +0000 (13:21 -0800)]
GRH76
Change-Id: Id9073e2103e2da00a4cfcb21012ced565cf8cb0d
android-merger [Tue, 14 Dec 2010 22:37:12 +0000 (14:37 -0800)]
GRH75
Change-Id: Ib941cd51df619a48a8cb81159b2cbd2de6e4094b
Dianne Hackborn [Tue, 14 Dec 2010 19:30:43 +0000 (11:30 -0800)]
(DO NOT MERGE) Issue #
3255640: Need to bump GB to API 10 version name "2.4"
We are now version 2.4, API 10.
Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
David 'Digit' Turner [Tue, 14 Dec 2010 10:37:05 +0000 (02:37 -0800)]
Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
David 'Digit' Turner [Fri, 10 Dec 2010 21:24:06 +0000 (22:24 +0100)]
Add support for custom Linux host toolchains when building the SDK.
This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.
Note that nothing happens if the new toolchain is not in the
prebuilt tree.
Change-Id: I45c1f68e37e15a0032f885df1c5c0f297b3d8642
Ying Wang [Sat, 11 Dec 2010 00:17:59 +0000 (16:17 -0800)]
Merge "Default uninstallable modules' tag to optional" into gingerbread
Ying Wang [Fri, 10 Dec 2010 19:17:28 +0000 (11:17 -0800)]
Default uninstallable modules' tag to optional
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
Jean-Baptiste Queru [Fri, 10 Dec 2010 15:46:16 +0000 (07:46 -0800)]
reconcile with open-source gingerbread
Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
android-merger [Thu, 9 Dec 2010 23:00:13 +0000 (15:00 -0800)]
GRH70B = GRH70 + NPE fixes in Maps.apk
Change-Id: I1c27cf39a1031d905faffa2ec14f0a1cffd2c19f
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I3f1b2a63684f29afdffb246c2d329fa8aac0008a
android-merger [Thu, 9 Dec 2010 18:49:06 +0000 (10:49 -0800)]
GRH70
Change-Id: Idca5a2b53baab06509f1f37deb9ffc97b64320e2
android-merger [Wed, 8 Dec 2010 06:57:18 +0000 (22:57 -0800)]
GRH68
Change-Id: Idac04adfa9a399c9d3f875c08d90ea61511b2c3f
Scott Main [Mon, 6 Dec 2010 02:03:23 +0000 (18:03 -0800)]
docs: fix link
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
Sriram Raman [Mon, 29 Nov 2010 23:51:20 +0000 (18:51 -0500)]
Add mkuserimg.sh, make_ext4fs to otatools
Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
android-build SharedAccount [Wed, 24 Nov 2010 19:10:15 +0000 (11:10 -0800)]
GRH55
Change-Id: Id49dc9ab01fa99992cfa0451b4e9d0ca80fb67fb
android-build SharedAccount [Tue, 23 Nov 2010 23:15:31 +0000 (15:15 -0800)]
GRH54
Change-Id: I755a50587f795379ddc298bfeea3dbd968d458a1
android-build SharedAccount [Tue, 23 Nov 2010 06:57:44 +0000 (22:57 -0800)]
GRH53
Change-Id: Ic75a7ca761d08353c49d9733a778a9a8f0535b0e
The Android Automerger [Fri, 19 Nov 2010 04:17:59 +0000 (20:17 -0800)]
GRH49
Change-Id: If2caeec1c4a2fc7f7d8f47b44dcefa5fa2bf3cfd
The Android Automerger [Wed, 17 Nov 2010 06:04:27 +0000 (22:04 -0800)]
GRH47B
Change-Id: Ifadc68ac2b20dda1b6fd51f8b03a5dd0ec9e0537
The Android Automerger [Wed, 17 Nov 2010 00:02:44 +0000 (16:02 -0800)]
GRH47
Change-Id: I40ef29c6861d2e143662b3532a6cdcd50f068d7f
The Android Automerger [Tue, 16 Nov 2010 05:12:25 +0000 (21:12 -0800)]
GRH46B
Change-Id: I68d84e244eddfe99c441c8928e993d2070143d06
The Android Automerger [Tue, 16 Nov 2010 01:24:27 +0000 (17:24 -0800)]
GRH46
Change-Id: I5306955ceb523fc1ec21eb3b969839c3d6c2184b
The Android Automerger [Fri, 12 Nov 2010 14:49:45 +0000 (06:49 -0800)]
GRH43
Change-Id: I568e44b3b5319865da9addfd80846c497d74eb60
The Android Automerger [Fri, 12 Nov 2010 06:05:39 +0000 (22:05 -0800)]
GRH42
Change-Id: Ia86a05f62271c753c56537941a3d6e38ee951609
android-build SharedAccount [Wed, 10 Nov 2010 18:37:14 +0000 (10:37 -0800)]
GRH41B
Change-Id: I2b0aaa91802ac2c47ac6107a9afc0b0c1d95dd8f
The Android Automerger [Wed, 10 Nov 2010 17:25:28 +0000 (09:25 -0800)]
GRH41
Change-Id: Ic49e58f4aecb3b7f06fc0b6db8f5d3c686d31493
The Android Automerger [Wed, 10 Nov 2010 17:25:13 +0000 (09:25 -0800)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Mon, 8 Nov 2010 20:28:14 +0000 (12:28 -0800)]
docs: revise intro to reflect changes to quick start
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
The Android Automerger [Sat, 6 Nov 2010 01:30:08 +0000 (18:30 -0700)]
GRH36
Change-Id: I9a1191fc8986382c8c692106be82a857b0af056b
The Android Automerger [Sat, 6 Nov 2010 01:29:53 +0000 (18:29 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Fri, 5 Nov 2010 21:29:07 +0000 (14:29 -0700)]
docs: add gingerbread logo for homepage
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
Scott Main [Fri, 5 Nov 2010 04:02:14 +0000 (21:02 -0700)]
docs: revisions to ndk download intro
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
Robert Ly [Wed, 3 Nov 2010 01:35:43 +0000 (18:35 -0700)]
Update the template text for the NDK download page to point to new
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
The Android Automerger [Thu, 4 Nov 2010 07:04:27 +0000 (00:04 -0700)]
GRH35
Change-Id: If31ec945f7180a6ec895ed60dba8813b0cd654cd
The Android Automerger [Wed, 3 Nov 2010 09:52:33 +0000 (02:52 -0700)]
GRH34
Change-Id: I663acf81dfceaea5a0d9f7b814ae85f07c402582
The Android Automerger [Tue, 2 Nov 2010 05:40:37 +0000 (22:40 -0700)]
GRH32
Change-Id: If18a69659ee4aa8772cd1b0132bea7acc3615b5f
The Android Automerger [Tue, 2 Nov 2010 05:40:23 +0000 (22:40 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Mon, 1 Nov 2010 22:51:49 +0000 (15:51 -0700)]
docs: make the resizable side nav standard. DO NOT MERGE.
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
Scott Main [Mon, 1 Nov 2010 17:49:07 +0000 (10:49 -0700)]
Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
The Android Automerger [Sat, 30 Oct 2010 04:37:53 +0000 (21:37 -0700)]
GRH29
Change-Id: Ib4c410b7fe0c81cc16280969284b8437a3235d46
The Android Automerger [Sat, 30 Oct 2010 04:37:37 +0000 (21:37 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:51:54 +0000 (05:51 -0700)]
am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4':
CTS vm-tests now depend on hosttestlib.
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:45:56 +0000 (05:45 -0700)]
Merge from AOSP froyo. Do not merge.
CTS vm-tests now depend on hosttestlib.
Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
android-build SharedAccount [Fri, 29 Oct 2010 04:50:05 +0000 (21:50 -0700)]
GRH28C
Change-Id: I584d860269afb63429295f9b4bf18ba5ba54c478
The Android Automerger [Fri, 29 Oct 2010 03:23:39 +0000 (20:23 -0700)]
GRH28B
Change-Id: Id49448f70e70e3acca906867c17ce3d5720fa888
The Android Automerger [Thu, 28 Oct 2010 19:25:47 +0000 (12:25 -0700)]
GRH28
Change-Id: I5665c46137ab31f0b753cc01cb03663e9d391cc5
The Android Automerger [Thu, 28 Oct 2010 19:25:34 +0000 (12:25 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Thu, 28 Oct 2010 05:35:24 +0000 (22:35 -0700)]
docs: update sdk download template DO NOT MERGE
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
Brett Chabot [Thu, 28 Oct 2010 01:49:33 +0000 (18:49 -0700)]
cherry pick 'CTS vm-tests depend on hostestlib' into GB.
Original description:
CTS vm-tests now depend on hosttestlib.
Bug
3125713
Conflicts:
core/tasks/cts.mk
Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
Jean-Baptiste Queru [Wed, 27 Oct 2010 21:59:39 +0000 (14:59 -0700)]
Merge "CTS vm-tests now depend on hosttestlib." into froyo
The Android Automerger [Wed, 27 Oct 2010 05:23:20 +0000 (22:23 -0700)]
GRH26B
Change-Id: Ibfcf3bee4b46416b37f7a26af81810e00b177a89
Brett Chabot [Wed, 27 Oct 2010 01:55:56 +0000 (18:55 -0700)]
CTS vm-tests now depend on hosttestlib.
Bug
3125713
Change-Id: I5774df2abeff7dd82e1218138d1ea3b25edd0901
The Android Automerger [Wed, 27 Oct 2010 00:11:43 +0000 (17:11 -0700)]
GRH26
Change-Id: I1e461e91ee633830081082363d1eb6f45dc14275
The Android Automerger [Tue, 26 Oct 2010 04:22:00 +0000 (21:22 -0700)]
GRH25B
Change-Id: I6be54e4cd9d9e138d234702829e69c7149e3529e
The Android Automerger [Tue, 26 Oct 2010 04:21:35 +0000 (21:21 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Tue, 26 Oct 2010 00:14:24 +0000 (17:14 -0700)]
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
OSDN Git Service
