Commit Graph

3290 Commits

Author SHA1 Message Date
Eric Fischer
ea11d56a72 am 21c80426: am 7c91ccfe: am 2ddbd568: Update zoneinfo time zone data to version 2009s
Merge commit '21c80426dd4fd1aa6fb13203e1422e562498f939'

* commit '21c80426dd4fd1aa6fb13203e1422e562498f939':
  Update zoneinfo time zone data to version 2009s
2009-11-20 15:55:44 -08:00
Eric Fischer
21c80426dd am 7c91ccfe: am 2ddbd568: Update zoneinfo time zone data to version 2009s
Merge commit '7c91ccfe1407cc192fb57c964c6419630cf651c0' into eclair-mr2-plus-aosp

* commit '7c91ccfe1407cc192fb57c964c6419630cf651c0':
  Update zoneinfo time zone data to version 2009s
2009-11-20 15:47:08 -08:00
Eric Fischer
7c91ccfe14 am 2ddbd568: Update zoneinfo time zone data to version 2009s
Merge commit '2ddbd5682b60c8604b0b85ccb280624f8845e22d' into eclair-mr2

* commit '2ddbd5682b60c8604b0b85ccb280624f8845e22d':
  Update zoneinfo time zone data to version 2009s
2009-11-20 15:42:04 -08:00
Eric Fischer
2ddbd5682b Update zoneinfo time zone data to version 2009s
http://b/issue?id=2272477
2009-11-20 14:37:35 -08:00
David 'Digit' Turner
47bb424002 am 688ccb34: am 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit '688ccb34589b3a810dbdc7e79eab206a3d9227a6'

* commit '688ccb34589b3a810dbdc7e79eab206a3d9227a6':
  Update the build-toolchain.sh script.
2009-11-19 17:42:01 -08:00
David 'Digit' Turner
688ccb3458 am 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit '1f22df41d80b06331056fe3915a3d7c394b1485f' into eclair-mr2-plus-aosp

* commit '1f22df41d80b06331056fe3915a3d7c394b1485f':
  Update the build-toolchain.sh script.
2009-11-19 13:54:39 -08:00
David 'Digit' Turner
1f22df41d8 am b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit 'b4e31b931d08e6269a194a1c24e23281410dff64' into eclair-mr2

* commit 'b4e31b931d08e6269a194a1c24e23281410dff64':
  Update the build-toolchain.sh script.
2009-11-19 13:49:22 -08:00
Android (Google) Code Review
b4e31b931d Merge change I3f0d5eb5 into eclair
* changes:
  Update the build-toolchain.sh script.
2009-11-19 13:45:53 -08:00
David 'Digit' Turner
69eeb8a22f Update the build-toolchain.sh script.
This patch modifies the script to be able to build all prebuilt toolchain
binaries in a single call. I.e. if passed a recent toolchain source package
generated with download-toolchain-sources.sh, then it will build both
GCC 4.2.1 and GCC 4.4.0 and place them in the final prebuilt tarball.

We need this because, while we're going to switch to gcc 4.4.0 by default
in a new version of the NDK, the 4.4.0 C++ compiler is more strict about
various constructs and might refuse to build certain sources. An option
will be given to application developers to use 4.2.1 instead, to keep their
sources building.

Other changes include:

Move all builds into a random temporary directory under /tmp by default,
unless you use --build-out=<path>.

Cleanup the build out directory on succesful build

The generated tarball is now named android-ndk-prebuilt-<date>-<host>.tar.bz2
by default, unless you use the new --release=<name> option which will replace
<date> with <name> instead.

Removal of un-needed files (e.g. info or man pages, libiberty static library,
etc..) to reduce the size of the final tarball.
2009-11-19 13:43:11 -08:00
Jeff Hamilton
d95ef21ffe am a9dcbaf1: am 4865c539: Add a runtest entry for the database tests.
Merge commit 'a9dcbaf1fa228731acfe13f918946f13d2e387e5'

* commit 'a9dcbaf1fa228731acfe13f918946f13d2e387e5':
  Add a runtest entry for the database tests.
2009-11-19 11:09:47 -08:00
Jeff Hamilton
a9dcbaf1fa am 4865c539: Add a runtest entry for the database tests.
Merge commit '4865c5393faedabcb6884e745cb4b2393674c8fd' into eclair-mr2-plus-aosp

* commit '4865c5393faedabcb6884e745cb4b2393674c8fd':
  Add a runtest entry for the database tests.
2009-11-19 11:04:42 -08:00
Jeff Hamilton
4865c5393f Add a runtest entry for the database tests. 2009-11-19 10:15:23 -08:00
Xavier Ducrohet
09021d3593 am 934b8ca5: resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp
Merge commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12'

* commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12':
  Remove components that were moved to sdk.git and update build scripts.
2009-11-18 17:58:54 -08:00
Xavier Ducrohet
934b8ca57b resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp 2009-11-18 17:52:10 -08:00
Xavier Ducrohet
8915fd90cf am 01d2087c: resolved conflicts for merge of 19cb54ea to eclair
Merge commit '01d2087c87627df5bfc7e684f62466e0a662197a' into eclair-mr2

* commit '01d2087c87627df5bfc7e684f62466e0a662197a':
  Remove components that were moved to sdk.git and update build scripts.
2009-11-18 17:14:02 -08:00
Xavier Ducrohet
01d2087c87 resolved conflicts for merge of 19cb54ea to eclair
Change-Id: I182195aeaad88aebc82988b1cec9ebda0c359bc8
2009-11-18 17:07:11 -08:00
Dan Egnor
f25236fb2b am 1c563caa: am e970b3d1: Add "common" runtest definition (for android-common library tests)
Merge commit '1c563caad4700be1be5eec2dab6d13b3dcd34e51'

* commit '1c563caad4700be1be5eec2dab6d13b3dcd34e51':
  Add "common" runtest definition (for android-common library tests)
2009-11-18 13:21:54 -08:00
Dan Egnor
1c563caad4 am e970b3d1: Add "common" runtest definition (for android-common library tests)
Merge commit 'e970b3d160719a58ef9c91c637eb5ec9dc95a3fe' into eclair-mr2-plus-aosp

* commit 'e970b3d160719a58ef9c91c637eb5ec9dc95a3fe':
  Add "common" runtest definition (for android-common library tests)
2009-11-18 13:11:28 -08:00
Dan Egnor
e970b3d160 Add "common" runtest definition (for android-common library tests) 2009-11-18 12:05:35 -08:00
Xavier Ducrohet
19cb54ea7d Remove components that were moved to sdk.git and update build scripts. 2009-11-17 15:17:25 -08:00
Raphael
2e3a9dd831 am a7e42085: am 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair
Merge commit 'a7e42085979affcc374fc15d7e86a1bf0a0f0176'

* commit 'a7e42085979affcc374fc15d7e86a1bf0a0f0176':
  SDK Manager: XML Schema for sdk-repository v2
2009-11-17 07:34:58 -08:00
David 'Digit' Turner
7b1456cfef am ca443267: am 5ad866dd: am e4df0ea1: Merge change I8d8b5816 into eclair
Merge commit 'ca4432676724e715caa50958383447ad2b65f02e'

* commit 'ca4432676724e715caa50958383447ad2b65f02e':
  Update build-toolchain.sh to be able to build gcc 4.4.0
2009-11-17 07:32:35 -08:00
David 'Digit' Turner
a3e48e4b6d am 853340a6: am 245c4282: am f3ec7a02: Merge change If72f81fb into eclair
Merge commit '853340a697d6fbdb1dc06ea8ad8073f228c0aa1b'

* commit '853340a697d6fbdb1dc06ea8ad8073f228c0aa1b':
  Add a script to download and package the toolchain sources.
2009-11-17 07:32:31 -08:00
Raphael
41746fae29 am 7371e184: am 12ed1a7d: am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.
Merge commit '7371e1847510e54995d4b1b1817370c3867bea52'

* commit '7371e1847510e54995d4b1b1817370c3867bea52':
  SDK Manager support for future schemas.
2009-11-17 07:32:15 -08:00
Raphael
a7e4208597 am 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair
Merge commit '6ae0010c61ed927ad715de4a75e140c932e1d86a' into eclair-mr2-plus-aosp

* commit '6ae0010c61ed927ad715de4a75e140c932e1d86a':
  SDK Manager: XML Schema for sdk-repository v2
2009-11-16 20:00:32 -08:00
Raphael
6ae0010c61 am 20d03274: Merge change I6809bd44 into eclair
Merge commit '20d0327492490b676a0a1036754e7742fb92bb69' into eclair-mr2

* commit '20d0327492490b676a0a1036754e7742fb92bb69':
  SDK Manager: XML Schema for sdk-repository v2
2009-11-16 19:56:59 -08:00
Android (Google) Code Review
20d0327492 Merge change I6809bd44 into eclair
* changes:
  SDK Manager: XML Schema for sdk-repository v2
2009-11-16 19:39:13 -08:00
Raphael
2db89e8fe9 SDK Manager: XML Schema for sdk-repository v2
v2 will be a full standalone schema, not reusing any parts of v1.
Each package type is now defined using a named type, which means
a v3 version would redifine the top element and could include
some named types of v2.

Unfortunately we cannot *extend* the top element from v1 because
extension in XML Schema seems to imply a sequence (i.e. fixed order)
whereas we use a "choice" mode to have 0..N of each types in any
order.

SDK BUG 2252825

Change-Id: I6809bd4486ef2d7f2473995ed5a0abb7fa377bdd
2009-11-16 18:05:10 -08:00
David 'Digit' Turner
ca44326767 am 5ad866dd: am e4df0ea1: Merge change I8d8b5816 into eclair
Merge commit '5ad866dd5dd886556be67b13e3138f979816f35a' into eclair-mr2-plus-aosp

* commit '5ad866dd5dd886556be67b13e3138f979816f35a':
  Update build-toolchain.sh to be able to build gcc 4.4.0
2009-11-16 15:03:39 -08:00
David 'Digit' Turner
853340a697 am 245c4282: am f3ec7a02: Merge change If72f81fb into eclair
Merge commit '245c4282dbccddc611dba1ff8a2575a33f9217b5' into eclair-mr2-plus-aosp

* commit '245c4282dbccddc611dba1ff8a2575a33f9217b5':
  Add a script to download and package the toolchain sources.
2009-11-16 15:03:34 -08:00
David 'Digit' Turner
5ad866dd5d am e4df0ea1: Merge change I8d8b5816 into eclair
Merge commit 'e4df0ea14bcfc6e2d395e36970749cf9a916a0fb' into eclair-mr2

* commit 'e4df0ea14bcfc6e2d395e36970749cf9a916a0fb':
  Update build-toolchain.sh to be able to build gcc 4.4.0
2009-11-16 14:59:15 -08:00
David 'Digit' Turner
245c4282db am f3ec7a02: Merge change If72f81fb into eclair
Merge commit 'f3ec7a02777ed9fcbe995711b8cb3f31de01d274' into eclair-mr2

* commit 'f3ec7a02777ed9fcbe995711b8cb3f31de01d274':
  Add a script to download and package the toolchain sources.
2009-11-16 14:59:11 -08:00
Android (Google) Code Review
e4df0ea14b Merge change I8d8b5816 into eclair
* changes:
  Update build-toolchain.sh to be able to build gcc 4.4.0
2009-11-16 14:53:57 -08:00
Android (Google) Code Review
f3ec7a0277 Merge change If72f81fb into eclair
* changes:
  Add a script to download and package the toolchain sources.
2009-11-16 14:53:45 -08:00
Raphael
d5ad8ee590 am f78995a8: am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
Merge commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b'

* commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b':
  SDK Manager: phase 1 of support for future schemas
2009-11-16 14:47:31 -08:00
Xavier Ducrohet
45b36a7bdd am 237c3bc1: (-s ours) am dd138bf1: am a0ac4b14: (-s ours) am b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit '237c3bc13181c1fb344a8c21af0417c5f86e26e3'

* commit '237c3bc13181c1fb344a8c21af0417c5f86e26e3':
  Rename the layout device from ION to ADP2. (do not merge)
2009-11-16 14:47:26 -08:00
Xavier Ducrohet
6032e4ac68 am a48826a4: am 8b633873: am 5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit 'a48826a4a612a82714fa364af0cd21ace04b20bc'

* commit 'a48826a4a612a82714fa364af0cd21ace04b20bc':
  Rename the layout device from ION to ADP2.
2009-11-16 14:47:21 -08:00
Raphael
7371e18475 am 12ed1a7d: am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.
Merge commit '12ed1a7d9a72fa16cb677027e1cea65206550a22' into eclair-mr2-plus-aosp

* commit '12ed1a7d9a72fa16cb677027e1cea65206550a22':
  SDK Manager support for future schemas.
2009-11-16 14:44:58 -08:00
Raphael
f78995a8ee am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
Merge commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9' into eclair-mr2-plus-aosp

* commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9':
  SDK Manager: phase 1 of support for future schemas
2009-11-16 14:41:03 -08:00
Xavier Ducrohet
237c3bc131 am dd138bf1: am a0ac4b14: (-s ours) am b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit 'dd138bf16096156754a0d3d7c94c3800bbc046d6' into eclair-mr2-plus-aosp

* commit 'dd138bf16096156754a0d3d7c94c3800bbc046d6':
  Rename the layout device from ION to ADP2. (do not merge)
2009-11-16 14:40:59 -08:00
Xavier Ducrohet
a48826a4a6 am 8b633873: am 5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b' into eclair-mr2-plus-aosp

* commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b':
  Rename the layout device from ION to ADP2.
2009-11-16 14:40:00 -08:00
Raphael
12ed1a7d9a am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.
Merge commit '5df7d75e1c9cc73b4fe0111f89f099e8dba3486b' into eclair-mr2

* commit '5df7d75e1c9cc73b4fe0111f89f099e8dba3486b':
  SDK Manager support for future schemas.
2009-11-16 14:29:40 -08:00
Raphael
5df7d75e1c am f4c63fae: SDK Manager support for future schemas.
Merge commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8' into eclair

* commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8':
  SDK Manager support for future schemas.
2009-11-16 14:25:49 -08:00
Raphael
f4c63fae0c SDK Manager support for future schemas.
This CL cleans up the v2 test by removing all v2 stuff
from the code right now. We only keep the part that
handles future schemas and right now the latest version is 1.

Change-Id: I31e6aeaf0582e94c67e1cc8317bec479ea7a52e7
2009-11-16 13:59:03 -08:00
Raphael
eeef441637 am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
Merge commit '6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-mr2

* commit '6dcf42149b183e2a2a062c90d60a2803cf01523a':
  SDK Manager: phase 1 of support for future schemas
2009-11-16 13:18:41 -08:00
Raphael
6dcf42149b resolved conflicts for merge of 0da4f158 to eclair
Fixes a merge eclair-sdk => eclair conflict of
  SDK Manager: phase 1 of support for future schemas
  SDK BUG 2252825

Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8
2009-11-16 13:07:43 -08:00
Xavier Ducrohet
dd138bf160 am a0ac4b14: (-s ours) am b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit 'a0ac4b1492ae742e2f12138b647ea9781054a1b0' into eclair-mr2

* commit 'a0ac4b1492ae742e2f12138b647ea9781054a1b0':
  Rename the layout device from ION to ADP2. (do not merge)
2009-11-16 12:54:36 -08:00
Android (Google) Code Review
0da4f158f9 Merge change If1bda264 into eclair-sdk
* changes:
  SDK Manager: phase 1 of support for future schemas
2009-11-16 12:53:09 -08:00
Xavier Ducrohet
a0ac4b1492 am b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit 'b624370d795cd1e17fcd9960c98c01463c23757f' into eclair

* commit 'b624370d795cd1e17fcd9960c98c01463c23757f':
  Rename the layout device from ION to ADP2. (do not merge)
2009-11-16 12:50:17 -08:00
David 'Digit' Turner
37e84c2056 Update build-toolchain.sh to be able to build gcc 4.4.0
Update the script used to build the prebuilt toolchain binaries.
There are now two ways to use it:

1/ As usual, just invoke it and it will download the source tarball,
   uncompress it, configure the toolchain sources, build them, then
   package the result into a 'prebuilt' tarball.

2/ Generate a new source tarball with the 'download-toolchain-sources.sh'
   script, and invoke build-toolchain.sh with the --package=<tarball>
   option.

Additionally, you can now specify --gcc-version=4.4.0 to build GCC 4.4.0
(with ARMv7 / FPU support)

The option --gdb-version=6.8 has been added but the build doesn't seem
to work yet. This will probably be fixed in the toolchain git repository
though.

This will be used to refresh the NDK with gcc 4.4.0 prebuilts and support
for armeabi-v7a soon.
2009-11-16 12:41:33 -08:00