OSDN Git Service

android-x86/sdk.git
14 years agoam 32767f58: am 178b6d4a: Add a new device to devices.xml for the Layout Editor.
Xavier Ducrohet [Fri, 4 Dec 2009 02:24:48 +0000 (18:24 -0800)]
am 32767f58: am 178b6d4a: Add a new device to devices.xml for the Layout Editor.

Merge commit '32767f584f7e0538c2f4c640337d12bf92492d0a' into eclair-mr2-plus-aosp

* commit '32767f584f7e0538c2f4c640337d12bf92492d0a':
  Add a new device to devices.xml for the Layout Editor.

14 years agoam 178b6d4a: Add a new device to devices.xml for the Layout Editor.
Xavier Ducrohet [Fri, 4 Dec 2009 02:19:43 +0000 (18:19 -0800)]
am 178b6d4a: Add a new device to devices.xml for the Layout Editor.

Merge commit '178b6d4a5600300dd31b9bfd9f98cd4e959c6544' into eclair-mr2

* commit '178b6d4a5600300dd31b9bfd9f98cd4e959c6544':
  Add a new device to devices.xml for the Layout Editor.

14 years agoam f1ec3b32: am 9f68a08a: Remove files that have been moved into development.git
Xavier Ducrohet [Fri, 4 Dec 2009 00:34:38 +0000 (16:34 -0800)]
am f1ec3b32: am 9f68a08a: Remove files that have been moved into development.git

Merge commit 'f1ec3b3280229d22f9e5a79b43d226fe08822dc6' into eclair-mr2-plus-aosp

* commit 'f1ec3b3280229d22f9e5a79b43d226fe08822dc6':
  Remove files that have been moved into development.git

14 years agoAdd a new device to devices.xml for the Layout Editor.
Xavier Ducrohet [Thu, 3 Dec 2009 22:54:32 +0000 (14:54 -0800)]
Add a new device to devices.xml for the Layout Editor.

BUG 2296284

14 years agoam 9f68a08a: Remove files that have been moved into development.git
Xavier Ducrohet [Thu, 3 Dec 2009 19:53:33 +0000 (11:53 -0800)]
am 9f68a08a: Remove files that have been moved into development.git

Merge commit '9f68a08a1d6a740e26f02e339a67c166cc83f1db' into eclair-mr2

* commit '9f68a08a1d6a740e26f02e339a67c166cc83f1db':
  Remove files that have been moved into development.git

14 years agoRemove files that have been moved into development.git
Xavier Ducrohet [Thu, 3 Dec 2009 03:10:44 +0000 (19:10 -0800)]
Remove files that have been moved into development.git

14 years agoam 31a4ba7c: am 40134607: Merge change I79854c45 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:53:16 +0000 (13:53 -0800)]
am 31a4ba7c: am 40134607: Merge change I79854c45 into eclair

Merge commit '31a4ba7c73f620c395dd9206e35f4dec099405dd' into eclair-mr2-plus-aosp

* commit '31a4ba7c73f620c395dd9206e35f4dec099405dd':
  Enforce 9+ MB sdcard size when creating AVDs.

14 years agoam 40134607: Merge change I79854c45 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:50:14 +0000 (13:50 -0800)]
am 40134607: Merge change I79854c45 into eclair

Merge commit '4013460709a66ea2cb1816faa99b3700f4760264' into eclair-mr2

* commit '4013460709a66ea2cb1816faa99b3700f4760264':
  Enforce 9+ MB sdcard size when creating AVDs.

14 years agoMerge change I79854c45 into eclair
Android (Google) Code Review [Wed, 2 Dec 2009 21:44:59 +0000 (13:44 -0800)]
Merge change I79854c45 into eclair

* changes:
  Enforce 9+ MB sdcard size when creating AVDs.

14 years agoEnforce 9+ MB sdcard size when creating AVDs.
Xavier Ducrohet [Wed, 2 Dec 2009 21:01:51 +0000 (13:01 -0800)]
Enforce 9+ MB sdcard size when creating AVDs.

BUG 2296337

14 years agoam 4ae961f9: am 5acbc909: Merge change Iaa970a49 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:02 +0000 (13:05 -0800)]
am 4ae961f9: am 5acbc909: Merge change Iaa970a49 into eclair

Merge commit '4ae961f9d100d03a1b42c1304fae18cd935fe7b2' into eclair-mr2-plus-aosp

* commit '4ae961f9d100d03a1b42c1304fae18cd935fe7b2':
  Clean up the content of scripts/ folder.

14 years agoam 5acbc909: Merge change Iaa970a49 into eclair
Xavier Ducrohet [Wed, 2 Dec 2009 21:01:57 +0000 (13:01 -0800)]
am 5acbc909: Merge change Iaa970a49 into eclair

Merge commit '5acbc90908dab4ac981c5a1e9577cb16c03fd394' into eclair-mr2

* commit '5acbc90908dab4ac981c5a1e9577cb16c03fd394':
  Clean up the content of scripts/ folder.

14 years agoMerge change Iaa970a49 into eclair
Android (Google) Code Review [Wed, 2 Dec 2009 20:59:44 +0000 (12:59 -0800)]
Merge change Iaa970a49 into eclair

* changes:
  Clean up the content of scripts/ folder.

14 years agoam 44b6f0e7: am 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.
Xavier Ducrohet [Wed, 2 Dec 2009 19:06:28 +0000 (11:06 -0800)]
am 44b6f0e7: am 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.

Merge commit '44b6f0e7427f256de5af72eff120115d6aee8188' into eclair-mr2-plus-aosp

* commit '44b6f0e7427f256de5af72eff120115d6aee8188':
  Fix a possible NPE when add-ons don't have optional APIs.

14 years agoam 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.
Xavier Ducrohet [Wed, 2 Dec 2009 19:03:13 +0000 (11:03 -0800)]
am 0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.

Merge commit '0cf765337d75539a42fb2ff1a635e2ad34c6446e' into eclair-mr2

* commit '0cf765337d75539a42fb2ff1a635e2ad34c6446e':
  Fix a possible NPE when add-ons don't have optional APIs.

14 years agoam a4e82ce0: am f200375d: 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.

14 years agoam f200375d: 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.

14 years agoFix a possible NPE when add-ons don't have optional APIs.
Xavier Ducrohet [Tue, 1 Dec 2009 22:40:42 +0000 (14:40 -0800)]
Fix a possible NPE when add-ons don't have optional APIs.

BUG 2235023

14 years agoClean up the content of scripts/ folder.
Xavier Ducrohet [Tue, 1 Dec 2009 21:02:31 +0000 (13:02 -0800)]
Clean up the content of scripts/ folder.

- move back some scripts into development/scripts/
- templates for Ant project go in sdk/templates/
- files that are packaged with the sdk go in sdk/files/

14 years agoADT 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.

14 years agoam e0c52b45: am e18bb230: am 109964b3: ADT fix: layout device config files can be...
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)

14 years agoam e18bb230: am 109964b3: 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)

14 years agoam 109964b3: 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)

14 years agoADT 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

14 years agoam 17337fd5: am 88ab0ccc: 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

14 years agoam 88ab0ccc: 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

14 years agoUpdate doc/platform source.prop to match 2.1/7
Xavier Ducrohet [Fri, 20 Nov 2009 00:42:33 +0000 (16:42 -0800)]
Update doc/platform source.prop to match 2.1/7

14 years agoam a76e68e1: am 7551a21b: Merge change I2b17d396 into eclair
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

14 years agoam d80e7a4b: am ad87495e: am 4b38ad89: SDK Manager: sort packages from remote reposit...
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.

14 years agoam 42316ee5: am 6c142098: am 534c38a2: Merge change I919980d2 into eclair-sdk
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.

14 years agoam 5b5b92b4: am 0aaed034: (-s ours) am ca6bb022: (-s ours) Merge change Ie805d2fa...
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)

14 years agoam 7551a21b: Merge change I2b17d396 into eclair
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

14 years agoMerge change I2b17d396 into eclair
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

14 years agoam ad87495e: am 4b38ad89: SDK Manager: sort packages from remote repositories.
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.

14 years agoam 6c142098: am 534c38a2: Merge change I919980d2 into eclair-sdk
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.

14 years agoam 0aaed034: (-s ours) am ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
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)

14 years agoMore ADT to 0.9.6
Xavier Ducrohet [Thu, 19 Nov 2009 19:28:42 +0000 (11:28 -0800)]
More ADT to 0.9.6

14 years agoam 4b38ad89: SDK Manager: sort packages from remote repositories.
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.

14 years agoam 534c38a2: Merge change I919980d2 into eclair-sdk
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.

14 years agoam ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
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)

14 years agoSDK Manager: sort packages from remote repositories.
Raphael [Thu, 19 Nov 2009 06:34:49 +0000 (22:34 -0800)]
SDK Manager: sort packages from remote repositories.

SDK BUG 2271987

14 years agoMerge change I919980d2 into eclair-sdk
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.

14 years agoMerge change Ie805d2fa into eclair-sdk
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)

14 years agoMove 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)

14 years agoDisplay a message in the SDK Manager when a new schema tool is available.
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

14 years agoam 7cb155fa: am 5c354903: am f1d64e29: Fix the sdk/scritps/create_*_symlinks for...
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.

14 years agoam 9b794fb9: am 0853b4ca: am d8ef7816: Remove sdk_clean.sh (moved to development...
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)

14 years agoam 5c354903: am f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git...
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.

14 years agoam f1d64e29: 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.

14 years agoam 0853b4ca: am d8ef7816: Remove sdk_clean.sh (moved to development/build/tools)
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)

14 years agoam d8ef7816: 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)

14 years agoFix the sdk/scritps/create_*_symlinks for the new SDK git project.
Raphael [Wed, 18 Nov 2009 19:27:35 +0000 (11:27 -0800)]
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.

14 years agoRemove sdk_clean.sh (moved to development/build/tools)
Xavier Ducrohet [Tue, 17 Nov 2009 23:10:15 +0000 (15:10 -0800)]
Remove sdk_clean.sh (moved to development/build/tools)

14 years agoam 6ae0010c: am 20d03274: Merge change I6809bd44 into eclair
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

14 years agoam 20d03274: Merge change I6809bd44 into eclair
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

14 years agoMerge change I6809bd44 into eclair
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

14 years agoSDK 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

14 years agoam 5ad866dd: am e4df0ea1: Merge change I8d8b5816 into eclair
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

14 years agoam 245c4282: am f3ec7a02: Merge change If72f81fb into eclair
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.

14 years agoam e4df0ea1: Merge change I8d8b5816 into eclair
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

14 years agoam f3ec7a02: Merge change If72f81fb into eclair
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.

14 years agoMerge change I8d8b5816 into eclair
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

14 years agoMerge change If72f81fb into eclair
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.

14 years agoam 12ed1a7d: am 5df7d75e: am f4c63fae: SDK Manager support for future schemas.
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.

14 years agoam eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
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

14 years agoam dd138bf1: am a0ac4b14: (-s ours) am b624370d: (-s ours) Rename the layout device...
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)

14 years agoam 8b633873: am 5f9e0abe: Merge change I5a66bbdf into eclair
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.

14 years agoam 5df7d75e: am f4c63fae: SDK Manager support for future schemas.
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.

14 years agoam f4c63fae: 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.

14 years agoSDK 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

14 years agoam 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair
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

14 years agoresolved conflicts for merge of 0da4f158 to eclair
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

14 years agoam a0ac4b14: (-s ours) am b624370d: (-s ours) Rename the layout device from ION to...
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)

14 years agoMerge change If1bda264 into eclair-sdk
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

14 years agoam b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
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)

14 years agoUpdate build-toolchain.sh to be able to build gcc 4.4.0
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.

14 years agoSDK Manager: phase 1 of support for future schemas
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

14 years agoam 5f9e0abe: Merge change I5a66bbdf into eclair
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.

14 years agoAdd a script to download and package the toolchain sources.
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.

14 years agoRename the layout device from ION to ADP2. (do not merge)
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.

14 years agoMerge change I5a66bbdf into 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.

14 years agoRename 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

14 years agomerge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:58:37 +0000 (14:58 -0800)]
merge from open-source master

14 years agoam 8507ead2: am 13dbc227: Merge change I62823795 into eclair
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

14 years agoam 2e533cc0: am 05ae5d65: Merge change I229c60a9 into eclair
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

14 years agoam 13dbc227: Merge change I62823795 into eclair
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

14 years agoam 05ae5d65: Merge change I229c60a9 into eclair
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

14 years agomerge from open-source master
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

14 years agoam 13dbc227: Merge change I62823795 into eclair
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

14 years agoMerge change I62823795 into eclair
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

14 years agoam 05ae5d65: Merge change I229c60a9 into eclair
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

14 years agoMove source.properties for doc 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

14 years agoMerge change I229c60a9 into eclair
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

14 years agoMove 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

14 years agomerge from eclair
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:05:38 +0000 (12:05 -0800)]
merge from eclair

14 years agoam 1ef75694: am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
Raphael [Sat, 14 Nov 2009 22:55:28 +0000 (14:55 -0800)]
am 1ef75694: am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk

Merge commit '1ef756940f7292987a32eeab656fc8737171dc03' into eclair-mr2-plus-aosp

* commit '1ef756940f7292987a32eeab656fc8737171dc03':
  SDK Manager: fix, create temp folder before download

14 years agoam e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
Raphael [Sat, 14 Nov 2009 22:50:13 +0000 (14:50 -0800)]
am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk

Merge commit 'e5387db7c2dabc9954434494054295f45e86e312' into eclair-plus-aosp

* commit 'e5387db7c2dabc9954434494054295f45e86e312':
  SDK Manager: fix, create temp folder before download

14 years agoam e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
Raphael [Sat, 14 Nov 2009 22:49:14 +0000 (14:49 -0800)]
am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk

Merge commit 'e5387db7c2dabc9954434494054295f45e86e312' into eclair-mr2

* commit 'e5387db7c2dabc9954434494054295f45e86e312':
  SDK Manager: fix, create temp folder before download

14 years agoam d2ad5e31: Merge change I361fb688 into eclair-sdk
Raphael [Sat, 14 Nov 2009 22:39:52 +0000 (14:39 -0800)]
am d2ad5e31: Merge change I361fb688 into eclair-sdk

Merge commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair

* commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6':
  SDK Manager: fix, create temp folder before download

14 years agoMerge change I361fb688 into eclair-sdk
Android (Google) Code Review [Sat, 14 Nov 2009 22:32:27 +0000 (14:32 -0800)]
Merge change I361fb688 into eclair-sdk

* changes:
  SDK Manager: fix, create temp folder before download