OSDN Git Service
Raphael [Wed, 2 Dec 2009 01:39:15 +0000 (17:39 -0800)]
am
a14ed802: am
a4e82ce0: am
f200375d: ADT GLE2: palette view with drag\'n\'drop source.
Merge commit '
a14ed8029b122146089033c0c2da0625112ce601'
* commit '
a14ed8029b122146089033c0c2da0625112ce601':
ADT GLE2: palette view with drag'n'drop source.
Raphael [Wed, 2 Dec 2009 01:29:34 +0000 (17:29 -0800)]
am
a4e82ce0: am
f200375d: ADT GLE2: palette view with drag\'n\'drop source.
Merge commit '
a4e82ce0dcbecf3190122f25de7f0e535f8d5aff' into eclair-mr2-plus-aosp
* commit '
a4e82ce0dcbecf3190122f25de7f0e535f8d5aff':
ADT GLE2: palette view with drag'n'drop source.
Raphael [Wed, 2 Dec 2009 01:05:46 +0000 (17:05 -0800)]
am
f200375d: ADT GLE2: palette view with drag\'n\'drop source.
Merge commit '
f200375d590efd084142d60058ce6c9543a1b9cd' into eclair-mr2
* commit '
f200375d590efd084142d60058ce6c9543a1b9cd':
ADT GLE2: palette view with drag'n'drop source.
Raphael [Mon, 30 Nov 2009 19:07:45 +0000 (11:07 -0800)]
ADT GLE2: palette view with drag'n'drop source.
Work in progress.
Raphael [Fri, 20 Nov 2009 21:26:20 +0000 (13:26 -0800)]
am
ecd2adbf: am
e0c52b45: am
e18bb230: am
109964b3: ADT fix: layout device config files can be empty (no devices)
Merge commit '
ecd2adbf804608e7a8e3d04684fb089f92bcc677'
* commit '
ecd2adbf804608e7a8e3d04684fb089f92bcc677':
ADT fix: layout device config files can be empty (no devices)
Raphael [Fri, 20 Nov 2009 21:24:56 +0000 (13:24 -0800)]
am
e0c52b45: am
e18bb230: am
109964b3: ADT fix: layout device config files can be empty (no devices)
Merge commit '
e0c52b450f174cdec73ee3851c8923f923ad3a32' into eclair-mr2-plus-aosp
* commit '
e0c52b450f174cdec73ee3851c8923f923ad3a32':
ADT fix: layout device config files can be empty (no devices)
Raphael [Fri, 20 Nov 2009 21:23:05 +0000 (13:23 -0800)]
am
e18bb230: am
109964b3: ADT fix: layout device config files can be empty (no devices)
Merge commit '
e18bb2306ec781713e87e9b4a776254876a87bb2' into eclair-mr2
* commit '
e18bb2306ec781713e87e9b4a776254876a87bb2':
ADT fix: layout device config files can be empty (no devices)
Raphael [Fri, 20 Nov 2009 21:19:15 +0000 (13:19 -0800)]
am
109964b3: ADT fix: layout device config files can be empty (no devices)
Merge commit '
109964b3c9b274d5c69f10114dff6917b597365b' into eclair
* commit '
109964b3c9b274d5c69f10114dff6917b597365b':
ADT fix: layout device config files can be empty (no devices)
Raphael [Fri, 20 Nov 2009 20:46:08 +0000 (12:46 -0800)]
ADT fix: layout device config files can be empty (no devices)
SDK BUG
2275276
Change-Id: I139f3b16a258a8e1b223b62d9c93e9870b6fb27c
Xavier Ducrohet [Fri, 20 Nov 2009 19:08:55 +0000 (11:08 -0800)]
am
c21295f2: am
17337fd5: am
88ab0ccc: Update doc/platform source.prop to match 2.1/7
Merge commit '
c21295f299e9be84d1645694d8bd760616020f31'
* commit '
c21295f299e9be84d1645694d8bd760616020f31':
Update doc/platform source.prop to match 2.1/7
Xavier Ducrohet [Fri, 20 Nov 2009 19:05:03 +0000 (11:05 -0800)]
am
17337fd5: am
88ab0ccc: Update doc/platform source.prop to match 2.1/7
Merge commit '
17337fd5ca882290d0595efe51a8ecb96dae69ce' into eclair-mr2-plus-aosp
* commit '
17337fd5ca882290d0595efe51a8ecb96dae69ce':
Update doc/platform source.prop to match 2.1/7
Xavier Ducrohet [Fri, 20 Nov 2009 19:01:34 +0000 (11:01 -0800)]
am
88ab0ccc: Update doc/platform source.prop to match 2.1/7
Merge commit '
88ab0ccc29326835007c628c79386ced7865dfff' into eclair-mr2
* commit '
88ab0ccc29326835007c628c79386ced7865dfff':
Update doc/platform source.prop to match 2.1/7
Xavier Ducrohet [Fri, 20 Nov 2009 01:39:29 +0000 (17:39 -0800)]
Raphael [Fri, 20 Nov 2009 01:39:26 +0000 (17:39 -0800)]
am
11002ce5: am
d80e7a4b: am
ad87495e: am
4b38ad89: SDK Manager: sort packages from remote repositories.
Merge commit '
11002ce5c9bfa86c3c0b6a8b9b7563a3a5a38de0'
* commit '
11002ce5c9bfa86c3c0b6a8b9b7563a3a5a38de0':
SDK Manager: sort packages from remote repositories.
Raphael [Fri, 20 Nov 2009 01:39:21 +0000 (17:39 -0800)]
am
d04ef627: am
42316ee5: am
6c142098: am
534c38a2: Merge change I919980d2 into eclair-sdk
Merge commit '
d04ef627e9878b80506c8c43ad87d37d7a3e043a'
* commit '
d04ef627e9878b80506c8c43ad87d37d7a3e043a':
Display a message in the SDK Manager when a new schema tool is available.
Xavier Ducrohet [Fri, 20 Nov 2009 01:39:17 +0000 (17:39 -0800)]
am
46b73719: (-s ours) am
5b5b92b4: am
0aaed034: (-s ours) am
ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
Merge commit '
46b7371956ec38e7a205f251e5b47b5075c5e975'
* commit '
46b7371956ec38e7a205f251e5b47b5075c5e975':
Move Eclipse plug-ins to 0.9.5 (do not merge)
Xavier Ducrohet [Fri, 20 Nov 2009 00:42:33 +0000 (16:42 -0800)]
Update doc/platform source.prop to match 2.1/7
Xavier Ducrohet [Thu, 19 Nov 2009 19:50:55 +0000 (11:50 -0800)]
am
a76e68e1: am
7551a21b: Merge change I2b17d396 into eclair
Merge commit '
a76e68e183c3877cc9a9cb85a2616e3464266e16' into eclair-mr2-plus-aosp
* commit '
a76e68e183c3877cc9a9cb85a2616e3464266e16':
More ADT to 0.9.6
Raphael [Thu, 19 Nov 2009 19:48:46 +0000 (11:48 -0800)]
am
d80e7a4b: am
ad87495e: am
4b38ad89: SDK Manager: sort packages from remote repositories.
Merge commit '
d80e7a4b837214438e4d5c66975ecf191caddc42' into eclair-mr2-plus-aosp
* commit '
d80e7a4b837214438e4d5c66975ecf191caddc42':
SDK Manager: sort packages from remote repositories.
Raphael [Thu, 19 Nov 2009 19:48:42 +0000 (11:48 -0800)]
am
42316ee5: am
6c142098: am
534c38a2: Merge change I919980d2 into eclair-sdk
Merge commit '
42316ee504edd3e9f0fe02e934837f964ab50213' into eclair-mr2-plus-aosp
* commit '
42316ee504edd3e9f0fe02e934837f964ab50213':
Display a message in the SDK Manager when a new schema tool is available.
Xavier Ducrohet [Thu, 19 Nov 2009 19:48:38 +0000 (11:48 -0800)]
am
5b5b92b4: am
0aaed034: (-s ours) am
ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
Merge commit '
5b5b92b458ccdcdfff90900fa4cfa00072e1d7d6' into eclair-mr2-plus-aosp
* commit '
5b5b92b458ccdcdfff90900fa4cfa00072e1d7d6':
Move Eclipse plug-ins to 0.9.5 (do not merge)
Xavier Ducrohet [Thu, 19 Nov 2009 19:47:27 +0000 (11:47 -0800)]
am
7551a21b: Merge change I2b17d396 into eclair
Merge commit '
7551a21b6c4b2b915beba68ba0c2a1c346c65d42' into eclair-mr2
* commit '
7551a21b6c4b2b915beba68ba0c2a1c346c65d42':
More ADT to 0.9.6
Android (Google) Code Review [Thu, 19 Nov 2009 19:46:00 +0000 (11:46 -0800)]
Merge change I2b17d396 into eclair
* changes:
More ADT to 0.9.6
Raphael [Thu, 19 Nov 2009 19:42:26 +0000 (11:42 -0800)]
am
ad87495e: am
4b38ad89: SDK Manager: sort packages from remote repositories.
Merge commit '
ad87495ec1634e7d7f0204958c0f81b7846c0f5b' into eclair-mr2
* commit '
ad87495ec1634e7d7f0204958c0f81b7846c0f5b':
SDK Manager: sort packages from remote repositories.
Raphael [Thu, 19 Nov 2009 19:42:18 +0000 (11:42 -0800)]
am
6c142098: am
534c38a2: Merge change I919980d2 into eclair-sdk
Merge commit '
6c142098bb3cf32ae8201c91f5d9d741e8832e58' into eclair-mr2
* commit '
6c142098bb3cf32ae8201c91f5d9d741e8832e58':
Display a message in the SDK Manager when a new schema tool is available.
Xavier Ducrohet [Thu, 19 Nov 2009 19:42:12 +0000 (11:42 -0800)]
am
0aaed034: (-s ours) am
ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
Merge commit '
0aaed034094ace5d96ffb92f8094b508bf8a8513' into eclair-mr2
* commit '
0aaed034094ace5d96ffb92f8094b508bf8a8513':
Move Eclipse plug-ins to 0.9.5 (do not merge)
Xavier Ducrohet [Thu, 19 Nov 2009 19:28:42 +0000 (11:28 -0800)]
More ADT to 0.9.6
Raphael [Thu, 19 Nov 2009 18:55:36 +0000 (10:55 -0800)]
am
4b38ad89: SDK Manager: sort packages from remote repositories.
Merge commit '
4b38ad894bdc56b21c0d7c2a169df49a8c4898b6' into eclair
* commit '
4b38ad894bdc56b21c0d7c2a169df49a8c4898b6':
SDK Manager: sort packages from remote repositories.
Raphael [Thu, 19 Nov 2009 18:50:56 +0000 (10:50 -0800)]
am
534c38a2: Merge change I919980d2 into eclair-sdk
Merge commit '
534c38a2033a1702ab5d41edd62aab3d4e6eb27a' into eclair
* commit '
534c38a2033a1702ab5d41edd62aab3d4e6eb27a':
Display a message in the SDK Manager when a new schema tool is available.
Xavier Ducrohet [Thu, 19 Nov 2009 18:49:24 +0000 (10:49 -0800)]
am
ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
Merge commit '
ca6bb0220e3823f81ee9493a19bd0ad49a404dc3' into eclair
* commit '
ca6bb0220e3823f81ee9493a19bd0ad49a404dc3':
Move Eclipse plug-ins to 0.9.5 (do not merge)
Raphael [Thu, 19 Nov 2009 06:34:49 +0000 (22:34 -0800)]
SDK Manager: sort packages from remote repositories.
SDK BUG
2271987
Android (Google) Code Review [Thu, 19 Nov 2009 18:42:59 +0000 (10:42 -0800)]
Merge change I919980d2 into eclair-sdk
* changes:
Display a message in the SDK Manager when a new schema tool is available.
Android (Google) Code Review [Thu, 19 Nov 2009 18:40:53 +0000 (10:40 -0800)]
Merge change Ie805d2fa into eclair-sdk
* changes:
Move Eclipse plug-ins to 0.9.5 (do not merge)
Xavier Ducrohet [Tue, 17 Nov 2009 23:38:04 +0000 (15:38 -0800)]
Move Eclipse plug-ins to 0.9.5 (do not merge)
Raphael [Thu, 19 Nov 2009 02:10:46 +0000 (18:10 -0800)]
Display a message in the SDK Manager when a new schema tool is available.
SDK BUG
2252825
Raphael [Thu, 19 Nov 2009 01:59:11 +0000 (17:59 -0800)]
am
8a255386: am
7cb155fa: am
5c354903: am
f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Merge commit '
8a2553866be73d86e49ba0153f48b5a60902c33c'
* commit '
8a2553866be73d86e49ba0153f48b5a60902c33c':
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Xavier Ducrohet [Thu, 19 Nov 2009 01:59:07 +0000 (17:59 -0800)]
am
16db7d88: am
9b794fb9: am
0853b4ca: am
d8ef7816: Remove sdk_clean.sh (moved to development/build/tools)
Merge commit '
16db7d88e994f4ecc3ca34d76887191915773442'
* commit '
16db7d88e994f4ecc3ca34d76887191915773442':
Remove sdk_clean.sh (moved to development/build/tools)
Raphael [Thu, 19 Nov 2009 01:54:52 +0000 (17:54 -0800)]
am
7cb155fa: am
5c354903: am
f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Merge commit '
7cb155fadcf1876de5bceddcbce42802210c9625' into eclair-mr2-plus-aosp
* commit '
7cb155fadcf1876de5bceddcbce42802210c9625':
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Xavier Ducrohet [Thu, 19 Nov 2009 01:54:48 +0000 (17:54 -0800)]
am
9b794fb9: am
0853b4ca: am
d8ef7816: Remove sdk_clean.sh (moved to development/build/tools)
Merge commit '
9b794fb939f42d78c8053aee90a80c7109df915d' into eclair-mr2-plus-aosp
* commit '
9b794fb939f42d78c8053aee90a80c7109df915d':
Remove sdk_clean.sh (moved to development/build/tools)
Raphael [Thu, 19 Nov 2009 01:15:55 +0000 (17:15 -0800)]
am
5c354903: am
f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Merge commit '
5c354903f8b77440a0b8c95e665018be077a3812' into eclair-mr2
* commit '
5c354903f8b77440a0b8c95e665018be077a3812':
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Raphael [Thu, 19 Nov 2009 01:12:02 +0000 (17:12 -0800)]
am
f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Merge commit '
f1d64e2975451e3bbbcd2e62a03a717308db500a' into eclair
* commit '
f1d64e2975451e3bbbcd2e62a03a717308db500a':
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Xavier Ducrohet [Thu, 19 Nov 2009 00:53:23 +0000 (16:53 -0800)]
am
0853b4ca: am
d8ef7816: Remove sdk_clean.sh (moved to development/build/tools)
Merge commit '
0853b4caccc14ad93e6278f30ab1743d997d63de' into eclair-mr2
* commit '
0853b4caccc14ad93e6278f30ab1743d997d63de':
Remove sdk_clean.sh (moved to development/build/tools)
Xavier Ducrohet [Thu, 19 Nov 2009 00:49:34 +0000 (16:49 -0800)]
am
d8ef7816: Remove sdk_clean.sh (moved to development/build/tools)
Merge commit '
d8ef7816f0ffafc6bcf1370ce70b5497e7587230' into eclair
* commit '
d8ef7816f0ffafc6bcf1370ce70b5497e7587230':
Remove sdk_clean.sh (moved to development/build/tools)
Raphael [Wed, 18 Nov 2009 19:27:35 +0000 (11:27 -0800)]
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Xavier Ducrohet [Tue, 17 Nov 2009 23:10:15 +0000 (15:10 -0800)]
Remove sdk_clean.sh (moved to development/build/tools)
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
Xavier Ducrohet [Sun, 15 Nov 2009 21:25:03 +0000 (13:25 -0800)]
am
13dbc227: Merge change I62823795 into eclair
Merge commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-plus-aosp
* commit '
13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Android (Google) Code Review [Sun, 15 Nov 2009 21:22:41 +0000 (13:22 -0800)]
Merge change I62823795 into eclair
* changes:
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 21:18:30 +0000 (13:18 -0800)]
am
05ae5d65: Merge change I229c60a9 into eclair
Merge commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-plus-aosp
* commit '
05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 21:16:01 +0000 (13:16 -0800)]
Move source.properties for doc in sync with 2.0.1
Change-Id: I6282379532159de597aaec50cad81b14a0c895ce
Android (Google) Code Review [Sun, 15 Nov 2009 21:14:47 +0000 (13:14 -0800)]
Merge change I229c60a9 into eclair
* changes:
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 20:52:56 +0000 (12:52 -0800)]
Move source.properties for platform in sync with 2.0.1
Change-Id: I229c60a97138c70bb9b27bd0aa60670b882cb711
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:05:38 +0000 (12:05 -0800)]
merge from eclair
Dan Morrill [Sun, 15 Nov 2009 19:49:30 +0000 (11:49 -0800)]
Cleaning up source.android.com files.
This change fixes some formatting artifacts that resulted from the export from
Sites, and also updates links to no longer point to Sites and use the standard
{@docRoot} idiom. Also contains a few content updates, and introduces a page
about branch management.
Raphael [Sat, 14 Nov 2009 23:01:55 +0000 (15:01 -0800)]
am
30f366d2: am
1ef75694: am
e5387db7: am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
30f366d23217cb71181353010464e99c9b42115f'
* commit '
30f366d23217cb71181353010464e99c9b42115f':
SDK Manager: fix, create temp folder before download