OSDN Git Service
David 'Digit' Turner [Tue, 24 Nov 2009 01:12:25 +0000 (17:12 -0800)]
am
014d368c: am
4b4129d3: am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
014d368c389cfeb29aeb59448696cf08a6d8c47a'
* commit '
014d368c389cfeb29aeb59448696cf08a6d8c47a':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:12:21 +0000 (17:12 -0800)]
am
f7c5f462: am
78cab803: am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
f7c5f462dd904a00d7d0bfb7e4cb300798592cdf'
* commit '
f7c5f462dd904a00d7d0bfb7e4cb300798592cdf':
Correct the raw offsets in the time zone index for a few zones.
David 'Digit' Turner [Tue, 24 Nov 2009 01:08:16 +0000 (17:08 -0800)]
am
4b4129d3: am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
4b4129d30c75ab58f2ff9cb0696e894fde2b144b' into eclair-mr2-plus-aosp
* commit '
4b4129d30c75ab58f2ff9cb0696e894fde2b144b':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:08:12 +0000 (17:08 -0800)]
am
78cab803: am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
78cab8038a79f1e42e42b17b0ff180e676653e31' into eclair-mr2-plus-aosp
* commit '
78cab8038a79f1e42e42b17b0ff180e676653e31':
Correct the raw offsets in the time zone index for a few zones.
David 'Digit' Turner [Tue, 24 Nov 2009 01:04:14 +0000 (17:04 -0800)]
am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
cc09e088d869453536a1e9d761bd92df1a19fe62' into eclair-mr2
* commit '
cc09e088d869453536a1e9d761bd92df1a19fe62':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:04:10 +0000 (17:04 -0800)]
am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
0d6684c86f152dabf7476d269fdaa3de1eb8fcac' into eclair-mr2
* commit '
0d6684c86f152dabf7476d269fdaa3de1eb8fcac':
Correct the raw offsets in the time zone index for a few zones.
Android (Google) Code Review [Tue, 24 Nov 2009 00:59:36 +0000 (16:59 -0800)]
Merge change Icb96cddc into eclair
* changes:
Cleanup installed binaries before the NDK build begins.
Android (Google) Code Review [Tue, 24 Nov 2009 00:59:17 +0000 (16:59 -0800)]
Merge change I44da0c8f into eclair
* changes:
Correct the raw offsets in the time zone index for a few zones.
Eric Fischer [Tue, 24 Nov 2009 00:30:34 +0000 (16:30 -0800)]
Correct the raw offsets in the time zone index for a few zones.
ZoneCompactor was using the system time zone database to get the offsets
instead of using the data it was compiling, so for newly added or recently
changed zones the index could be inconsistent with the data.
Affected zones: San_Luis, Casey, Davis, Mawson, Kathmandu, Novokuznetsk
David 'Digit' Turner [Tue, 24 Nov 2009 00:12:12 +0000 (16:12 -0800)]
Cleanup installed binaries before the NDK build begins.
Ensures that no stale/obsolete shared libraries are left in the
application's project path before the build.
Also fix a minor typo that made the ABI selection process not
work properly in certain cases.
Roman Nurik [Tue, 24 Nov 2009 00:07:31 +0000 (16:07 -0800)]
am
ef50eddd: am
14f81209: am
0431e70d: Remove placeholder "-" label text, that was breaking the build.
Merge commit '
ef50edddcc8224460aeac2b3ce41b8e332925c65'
* commit '
ef50edddcc8224460aeac2b3ce41b8e332925c65':
Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Tue, 24 Nov 2009 00:04:54 +0000 (16:04 -0800)]
am
5797aa8a: am
536fc99b: am
a7178809: Fresh new change for: Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Merge commit '
5797aa8abe19a99019623105f6229b63fb8b4cc6'
* commit '
5797aa8abe19a99019623105f6229b63fb8b4cc6':
Fresh new change for:
Roman Nurik [Tue, 24 Nov 2009 00:04:28 +0000 (16:04 -0800)]
am
2c522fa3: am
ea6616ac: am
f28c33b6: Merge change I4ba0290a into eclair
Merge commit '
2c522fa3b79ce117769a06d9fd0a9b0a9e810be1'
* commit '
2c522fa3b79ce117769a06d9fd0a9b0a9e810be1':
Add Multiple Resolutions (MultiRes) sample code.
Roman Nurik [Mon, 23 Nov 2009 23:43:25 +0000 (15:43 -0800)]
am
14f81209: am
0431e70d: Remove placeholder "-" label text, that was breaking the build.
Merge commit '
14f81209b79faf87bf4ffed6fbaaa9da6a75d770' into eclair-mr2-plus-aosp
* commit '
14f81209b79faf87bf4ffed6fbaaa9da6a75d770':
Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 23:37:35 +0000 (15:37 -0800)]
am
0431e70d: Remove placeholder "-" label text, that was breaking the build.
Merge commit '
0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-mr2
* commit '
0431e70ddd0673ed4d9cf69d211592cb2926c076':
Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 22:54:57 +0000 (17:54 -0500)]
Remove placeholder "-" label text, that was breaking the build.
Roman Nurik [Mon, 23 Nov 2009 22:28:32 +0000 (14:28 -0800)]
am
536fc99b: am
a7178809: Fresh new change for: Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Merge commit '
536fc99b535f6848752615a1b2bf0cddf8f23491' into eclair-mr2-plus-aosp
* commit '
536fc99b535f6848752615a1b2bf0cddf8f23491':
Fresh new change for:
Roman Nurik [Mon, 23 Nov 2009 22:24:37 +0000 (14:24 -0800)]
am
a7178809: Fresh new change for: Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Merge commit '
a7178809f6aecff7c4e3ae3374b7cba5adc692bf' into eclair-mr2
* commit '
a7178809f6aecff7c4e3ae3374b7cba5adc692bf':
Fresh new change for:
Roman Nurik [Mon, 23 Nov 2009 22:11:04 +0000 (17:11 -0500)]
Fresh new change for:
Add Live Folder support to NotePad sample, and add new icons for the app and Live Folder (separate for Donut and Eclair).
Previous change 33290 was screwed up.
Xav, please pardon a repo newbie!
Roman Nurik [Mon, 23 Nov 2009 21:53:42 +0000 (13:53 -0800)]
am
ea6616ac: am
f28c33b6: Merge change I4ba0290a into eclair
Merge commit '
ea6616ac3d733b1627d5addc9c62412d53dd1c26' into eclair-mr2-plus-aosp
* commit '
ea6616ac3d733b1627d5addc9c62412d53dd1c26':
Add Multiple Resolutions (MultiRes) sample code.
Roman Nurik [Mon, 23 Nov 2009 21:51:01 +0000 (13:51 -0800)]
am
f28c33b6: Merge change I4ba0290a into eclair
Merge commit '
f28c33b6ec3401537a386995e2ec13fbc65c1957' into eclair-mr2
* commit '
f28c33b6ec3401537a386995e2ec13fbc65c1957':
Add Multiple Resolutions (MultiRes) sample code.
Android (Google) Code Review [Mon, 23 Nov 2009 21:45:14 +0000 (13:45 -0800)]
Merge change I4ba0290a into eclair
* changes:
Add Multiple Resolutions (MultiRes) sample code.
Scott Main [Mon, 23 Nov 2009 18:24:12 +0000 (10:24 -0800)]
am
75239b51: am
21acc900: am
e71c2828: am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
75239b51770825ea3da2673d4b81be1676145d51'
* commit '
75239b51770825ea3da2673d4b81be1676145d51':
docs: make the apidemos app index page only display the
Scott Main [Mon, 23 Nov 2009 18:18:24 +0000 (10:18 -0800)]
am
21acc900: am
e71c2828: am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp
* commit '
21acc90055935d052e350fe441091091c2421010':
docs: make the apidemos app index page only display the
Scott Main [Mon, 23 Nov 2009 18:13:44 +0000 (10:13 -0800)]
am
e71c2828: am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2
* commit '
e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Scott Main [Mon, 23 Nov 2009 18:07:10 +0000 (10:07 -0800)]
am
1558abd6: Merge change I53e268db into eclair-sdk
Merge commit '
1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair
* commit '
1558abd6d3706380cf4634c151ee7952e0b317fb':
docs: make the apidemos app index page only display the
Android (Google) Code Review [Mon, 23 Nov 2009 17:57:22 +0000 (09:57 -0800)]
Merge change I53e268db into eclair-sdk
* changes:
docs: make the apidemos app index page only display the shortcut links when the docs are online, because these links will not resolve when the docs are offline.
Roman Nurik [Mon, 16 Nov 2009 20:23:42 +0000 (15:23 -0500)]
Add Multiple Resolutions (MultiRes) sample code.
David 'Digit' Turner [Sat, 21 Nov 2009 00:59:05 +0000 (16:59 -0800)]
am
0a846112: am
2e00a813: am
c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit '
0a84611272549cf0fcee2bca5dde25ee20123ab8'
* commit '
0a84611272549cf0fcee2bca5dde25ee20123ab8':
Add support for armeabi-v7a to the NDK.
David 'Digit' Turner [Sat, 21 Nov 2009 00:53:51 +0000 (16:53 -0800)]
am
2e00a813: am
c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit '
2e00a8137d02b7478687f08431cd1f62abf17344' into eclair-mr2-plus-aosp
* commit '
2e00a8137d02b7478687f08431cd1f62abf17344':
Add support for armeabi-v7a to the NDK.
David 'Digit' Turner [Sat, 21 Nov 2009 00:48:53 +0000 (16:48 -0800)]
am
c7f23b57: Merge change Ifb9dee6f into eclair
Merge commit '
c7f23b570c16d99ce30b9819e28caee480795030' into eclair-mr2
* commit '
c7f23b570c16d99ce30b9819e28caee480795030':
Add support for armeabi-v7a to the NDK.
Android (Google) Code Review [Sat, 21 Nov 2009 00:44:45 +0000 (16:44 -0800)]
Merge change Ifb9dee6f into eclair
* changes:
Add support for armeabi-v7a to the NDK.
Eric Fischer [Fri, 20 Nov 2009 23:55:44 +0000 (15:55 -0800)]
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
Eric Fischer [Fri, 20 Nov 2009 23:47:08 +0000 (15:47 -0800)]
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
Eric Fischer [Fri, 20 Nov 2009 23:42:04 +0000 (15:42 -0800)]
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
Scott Main [Fri, 20 Nov 2009 22:38:29 +0000 (14:38 -0800)]
docs: make the apidemos app index page only display the
shortcut links when the docs are online, because these
links will not resolve when the docs are offline.
this is a silly hack, but a temporary one until these
samples are moved.
Change-Id: I53e268db265cec143ca5e561ca2d6b4df3dba3e2
Eric Fischer [Fri, 20 Nov 2009 22:37:35 +0000 (14:37 -0800)]
Update zoneinfo time zone data to version 2009s
http://b/issue?id=
2272477
David 'Digit' Turner [Thu, 19 Nov 2009 02:05:55 +0000 (18:05 -0800)]
Add support for armeabi-v7a to the NDK.
This patch modifies the NDK build scripts to support the 'armeabi-v7a' ABI.
(For the record, it corresponds to Thumb-2 + FPU support, to speed up native
code on certain devices like the Droid).
To build for this ABI, the Application.mk file should use a line like:
APP_ABI := armeabi-v7a
It is also possible to build for both 'armeabi' and 'armeabi-v7a' by using:
APP_ABI := armeabi armeabi-v7a
This will result in the generation of two distinct shared libraries that both
will be copied to the final application package.
This is dependent on having GCC 4.4.0 prebuilt binaries under
build/prebuilt/<host>/arm-eabi-4.4.0, since gcc 4.2.1 does not support
this new ABI.
Note that this also changes the NDK to use gcc 4.4.0 by default, unless
the user defines NDK_TOOLCHAIN to 'arm-eabi-4.2.1' in its environment to
switch back to the previous one.
David 'Digit' Turner [Fri, 20 Nov 2009 01:42:01 +0000 (17:42 -0800)]
am
688ccb34: am
1f22df41: am
b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit '
688ccb34589b3a810dbdc7e79eab206a3d9227a6'
* commit '
688ccb34589b3a810dbdc7e79eab206a3d9227a6':
Update the build-toolchain.sh script.
David 'Digit' Turner [Thu, 19 Nov 2009 21:54:39 +0000 (13:54 -0800)]
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.
David 'Digit' Turner [Thu, 19 Nov 2009 21:49:22 +0000 (13:49 -0800)]
am
b4e31b93: Merge change I3f0d5eb5 into eclair
Merge commit '
b4e31b931d08e6269a194a1c24e23281410dff64' into eclair-mr2
* commit '
b4e31b931d08e6269a194a1c24e23281410dff64':
Update the build-toolchain.sh script.
Android (Google) Code Review [Thu, 19 Nov 2009 21:45:53 +0000 (13:45 -0800)]
Merge change I3f0d5eb5 into eclair
* changes:
Update the build-toolchain.sh script.
David 'Digit' Turner [Thu, 19 Nov 2009 01:03:52 +0000 (17:03 -0800)]
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.
Jeff Hamilton [Thu, 19 Nov 2009 19:09:47 +0000 (11:09 -0800)]
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.
Jeff Hamilton [Thu, 19 Nov 2009 19:04:42 +0000 (11:04 -0800)]
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.
Jeff Hamilton [Thu, 19 Nov 2009 18:15:23 +0000 (10:15 -0800)]
Add a runtest entry for the database tests.
Xavier Ducrohet [Thu, 19 Nov 2009 01:58:54 +0000 (17:58 -0800)]
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.
Xavier Ducrohet [Thu, 19 Nov 2009 01:52:10 +0000 (17:52 -0800)]
resolved conflicts for merge of
8915fd90 to eclair-mr2-plus-aosp
Xavier Ducrohet [Thu, 19 Nov 2009 01:14:02 +0000 (17:14 -0800)]
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.
Xavier Ducrohet [Thu, 19 Nov 2009 01:07:11 +0000 (17:07 -0800)]
resolved conflicts for merge of
19cb54ea to eclair
Change-Id: I182195aeaad88aebc82988b1cec9ebda0c359bc8
Dan Egnor [Wed, 18 Nov 2009 21:21:54 +0000 (13:21 -0800)]
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)
Dan Egnor [Wed, 18 Nov 2009 21:11:28 +0000 (13:11 -0800)]
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)
Dan Egnor [Wed, 18 Nov 2009 20:05:35 +0000 (12:05 -0800)]
Add "common" runtest definition (for android-common library tests)
Xavier Ducrohet [Tue, 17 Nov 2009 23:11:59 +0000 (15:11 -0800)]
Remove components that were moved to sdk.git and update build scripts.
Raphael [Tue, 17 Nov 2009 15:34:58 +0000 (07:34 -0800)]
am
a7e42085: am
6ae0010c: am
20d03274: Merge change I6809bd44 into eclair
Merge commit '
a7e42085979affcc374fc15d7e86a1bf0a0f0176'
* commit '
a7e42085979affcc374fc15d7e86a1bf0a0f0176':
SDK Manager: XML Schema for sdk-repository v2
David 'Digit' Turner [Tue, 17 Nov 2009 15:32:35 +0000 (07:32 -0800)]
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
David 'Digit' Turner [Tue, 17 Nov 2009 15:32:31 +0000 (07:32 -0800)]
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.
Raphael [Tue, 17 Nov 2009 15:32:15 +0000 (07:32 -0800)]
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.
Raphael [Tue, 17 Nov 2009 04:00:32 +0000 (20:00 -0800)]
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
Raphael [Tue, 17 Nov 2009 03:56:59 +0000 (19:56 -0800)]
am
20d03274: Merge change I6809bd44 into eclair
Merge commit '
20d0327492490b676a0a1036754e7742fb92bb69' into eclair-mr2
* commit '
20d0327492490b676a0a1036754e7742fb92bb69':
SDK Manager: XML Schema for sdk-repository v2
Android (Google) Code Review [Tue, 17 Nov 2009 03:39:13 +0000 (19:39 -0800)]
Merge change I6809bd44 into eclair
* changes:
SDK Manager: XML Schema for sdk-repository v2
Raphael [Tue, 17 Nov 2009 02:00:59 +0000 (18:00 -0800)]
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
David 'Digit' Turner [Mon, 16 Nov 2009 23:03:39 +0000 (15:03 -0800)]
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
David 'Digit' Turner [Mon, 16 Nov 2009 23:03:34 +0000 (15:03 -0800)]
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.
David 'Digit' Turner [Mon, 16 Nov 2009 22:59:15 +0000 (14:59 -0800)]
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
David 'Digit' Turner [Mon, 16 Nov 2009 22:59:11 +0000 (14:59 -0800)]
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.
Android (Google) Code Review [Mon, 16 Nov 2009 22:53:57 +0000 (14:53 -0800)]
Merge change I8d8b5816 into eclair
* changes:
Update build-toolchain.sh to be able to build gcc 4.4.0
Android (Google) Code Review [Mon, 16 Nov 2009 22:53:45 +0000 (14:53 -0800)]
Merge change If72f81fb into eclair
* changes:
Add a script to download and package the toolchain sources.
Raphael [Mon, 16 Nov 2009 22:47:31 +0000 (14:47 -0800)]
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
Xavier Ducrohet [Mon, 16 Nov 2009 22:47:26 +0000 (14:47 -0800)]
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)
Xavier Ducrohet [Mon, 16 Nov 2009 22:47:21 +0000 (14:47 -0800)]
am
a48826a4: am
8b633873: am
5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '
a48826a4a612a82714fa364af0cd21ace04b20bc'
* commit '
a48826a4a612a82714fa364af0cd21ace04b20bc':
Rename the layout device from ION to ADP2.
Raphael [Mon, 16 Nov 2009 22:44:58 +0000 (14:44 -0800)]
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.
Raphael [Mon, 16 Nov 2009 22:41:03 +0000 (14:41 -0800)]
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
Xavier Ducrohet [Mon, 16 Nov 2009 22:40:59 +0000 (14:40 -0800)]
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)
Xavier Ducrohet [Mon, 16 Nov 2009 22:40:00 +0000 (14:40 -0800)]
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.
Raphael [Mon, 16 Nov 2009 22:29:40 +0000 (14:29 -0800)]
am
5df7d75e: am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
5df7d75e1c9cc73b4fe0111f89f099e8dba3486b' into eclair-mr2
* commit '
5df7d75e1c9cc73b4fe0111f89f099e8dba3486b':
SDK Manager support for future schemas.
Raphael [Mon, 16 Nov 2009 22:25:49 +0000 (14:25 -0800)]
am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
f4c63fae0c6d0654ab49e05b3292e218f82f97d8' into eclair
* commit '
f4c63fae0c6d0654ab49e05b3292e218f82f97d8':
SDK Manager support for future schemas.
Raphael [Mon, 16 Nov 2009 21:51:15 +0000 (13:51 -0800)]
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
Raphael [Mon, 16 Nov 2009 21:18:41 +0000 (13:18 -0800)]
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
Raphael [Mon, 16 Nov 2009 21:06:54 +0000 (13:06 -0800)]
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
Xavier Ducrohet [Mon, 16 Nov 2009 20:54:36 +0000 (12:54 -0800)]
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)
Android (Google) Code Review [Mon, 16 Nov 2009 20:53:09 +0000 (12:53 -0800)]
Merge change If1bda264 into eclair-sdk
* changes:
SDK Manager: phase 1 of support for future schemas
Xavier Ducrohet [Mon, 16 Nov 2009 20:50:17 +0000 (12:50 -0800)]
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)
David 'Digit' Turner [Mon, 16 Nov 2009 19:39:52 +0000 (11:39 -0800)]
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.
Raphael [Sun, 15 Nov 2009 05:30:27 +0000 (21:30 -0800)]
SDK Manager: phase 1 of support for future schemas
This is phase 1 of the support for future schemas:
- introduces a new v2 of the XSD
- handles an unknown XSD and extract its tools elements after
some hand checks.
TODO in phase 2:
- we still need to iron out the details of the sample node.
- there's no support for samples yet... this commit is not
about switching the sample code support to the new structure.
- there's no indication to the user that we are handling a new
schema... there should be some visual clue on why only the
tools are shown.
SDK BUG
2252825
Change-Id: If1bda26414cfe15275063d3187a98be6301d2992
Xavier Ducrohet [Mon, 16 Nov 2009 19:32:34 +0000 (11:32 -0800)]
am
5f9e0abe: Merge change I5a66bbdf into eclair
Merge commit '
5f9e0abed17ab1197a0868729232cb2c2024cef2' into eclair-mr2
* commit '
5f9e0abed17ab1197a0868729232cb2c2024cef2':
Rename the layout device from ION to ADP2.
David 'Digit' Turner [Mon, 16 Nov 2009 19:26:06 +0000 (11:26 -0800)]
Add a script to download and package the toolchain sources.
download-toolchain-sources.sh will download the current toolchain sources
from our git repositories then finely package them into a compressed
tarball that will later be used to rebuild the prebuilt binaries properly.
Due to the way our sources are stored in the git repository, the sources
in the tarball are laid out slightly differently than in the original toolchain
source archive used for NDK 1.6.
An upcoming patch will modify build-toolchain.sh to deal with the difference
and also allow the build of gcc-4.4.0 and gdb-6.8.
Xavier Ducrohet [Mon, 16 Nov 2009 01:02:26 +0000 (17:02 -0800)]
Rename the layout device from ION to ADP2. (do not merge)
This is integrated from Eclair.
Android (Google) Code Review [Mon, 16 Nov 2009 19:21:10 +0000 (11:21 -0800)]
Merge change I5a66bbdf into eclair
* changes:
Rename the layout device from ION to ADP2.
Xavier Ducrohet [Mon, 16 Nov 2009 01:02:26 +0000 (17:02 -0800)]
Rename the layout device from ION to ADP2.
Change-Id: I5a66bbdf68772504cac2379ea85edb88c77f2fde
Jean-Baptiste Queru [Sun, 15 Nov 2009 23:01:13 +0000 (15:01 -0800)]
am
c02bfe5e: merge from open-source master
Merge commit '
c02bfe5e77b84b82f3830f00554be5e735486850'
* commit '
c02bfe5e77b84b82f3830f00554be5e735486850':
eclair snapshot
Part 2 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
Part 1 of 2 for merge of
ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
Xavier Ducrohet [Sun, 15 Nov 2009 23:01:09 +0000 (15:01 -0800)]
am
c68f8c10: am
8507ead2: am
13dbc227: Merge change I62823795 into eclair
Merge commit '
c68f8c10f49e110b9b731d5f0c96acaf564b8ed5'
* commit '
c68f8c10f49e110b9b731d5f0c96acaf564b8ed5':
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 23:01:04 +0000 (15:01 -0800)]
am
aab6b89d: am
2e533cc0: am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
aab6b89debd56304b2fdde39292f36149a11f728'
* commit '
aab6b89debd56304b2fdde39292f36149a11f728':
Move source.properties for platform in sync with 2.0.1
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:58:37 +0000 (14:58 -0800)]
merge from open-source master
Xavier Ducrohet [Sun, 15 Nov 2009 22:55:20 +0000 (14:55 -0800)]
am
8507ead2: am
13dbc227: Merge change I62823795 into eclair
Merge commit '
8507ead2e565728e53e6f3c54be05fd21baab7d2' into eclair-mr2-plus-aosp
* commit '
8507ead2e565728e53e6f3c54be05fd21baab7d2':
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:55:10 +0000 (14:55 -0800)]
am
2e533cc0: am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
2e533cc0448af6e2add7ab346ff451dde79c1ced' into eclair-mr2-plus-aosp
* commit '
2e533cc0448af6e2add7ab346ff451dde79c1ced':
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:50:49 +0000 (14:50 -0800)]
am
13dbc227: Merge change I62823795 into eclair
Merge commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-mr2
* commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 22:50:44 +0000 (14:50 -0800)]
am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-mr2
* commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
Android (Google) Code Review [Sun, 15 Nov 2009 22:07:51 +0000 (14:07 -0800)]
Merge change Ia9788cd9
* changes:
Cleaning up source.android.com files.
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:05:57 +0000 (14:05 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD