Merge commit '237c3bc13181c1fb344a8c21af0417c5f86e26e3'
* commit '237c3bc13181c1fb344a8c21af0417c5f86e26e3':
Rename the layout device from ION to ADP2. (do not merge)
Merge commit 'a48826a4a612a82714fa364af0cd21ace04b20bc'
* commit 'a48826a4a612a82714fa364af0cd21ace04b20bc':
Rename the layout device from ION to ADP2.
Merge commit '12ed1a7d9a72fa16cb677027e1cea65206550a22' into eclair-mr2-plus-aosp
* commit '12ed1a7d9a72fa16cb677027e1cea65206550a22':
SDK Manager support for future schemas.
Merge commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9' into eclair-mr2-plus-aosp
* commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9':
SDK Manager: phase 1 of support for future schemas
Merge commit 'dd138bf16096156754a0d3d7c94c3800bbc046d6' into eclair-mr2-plus-aosp
* commit 'dd138bf16096156754a0d3d7c94c3800bbc046d6':
Rename the layout device from ION to ADP2. (do not merge)
Merge commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b' into eclair-mr2-plus-aosp
* commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b':
Rename the layout device from ION to ADP2.
Merge commit '5df7d75e1c9cc73b4fe0111f89f099e8dba3486b' into eclair-mr2
* commit '5df7d75e1c9cc73b4fe0111f89f099e8dba3486b':
SDK Manager support for future schemas.
Merge commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8' into eclair
* commit 'f4c63fae0c6d0654ab49e05b3292e218f82f97d8':
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
Merge commit '6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-mr2
* commit '6dcf42149b183e2a2a062c90d60a2803cf01523a':
SDK Manager: phase 1 of support for future schemas
Fixes a merge eclair-sdk => eclair conflict of
SDK Manager: phase 1 of support for future schemas
SDK BUG 2252825
Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8
Merge commit 'a0ac4b1492ae742e2f12138b647ea9781054a1b0' into eclair-mr2
* commit 'a0ac4b1492ae742e2f12138b647ea9781054a1b0':
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)
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.
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
Merge commit '5f9e0abed17ab1197a0868729232cb2c2024cef2' into eclair-mr2
* commit '5f9e0abed17ab1197a0868729232cb2c2024cef2':
Rename the layout device from ION to ADP2.
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.
Merge commit 'c02bfe5e77b84b82f3830f00554be5e735486850'
* commit 'c02bfe5e77b84b82f3830f00554be5e735486850':
eclair snapshot
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
Merge commit 'c68f8c10f49e110b9b731d5f0c96acaf564b8ed5'
* commit 'c68f8c10f49e110b9b731d5f0c96acaf564b8ed5':
Move source.properties for doc in sync with 2.0.1
Merge commit 'aab6b89debd56304b2fdde39292f36149a11f728'
* commit 'aab6b89debd56304b2fdde39292f36149a11f728':
Move source.properties for platform in sync with 2.0.1
Merge commit '8507ead2e565728e53e6f3c54be05fd21baab7d2' into eclair-mr2-plus-aosp
* commit '8507ead2e565728e53e6f3c54be05fd21baab7d2':
Move source.properties for doc in sync with 2.0.1
Merge commit '2e533cc0448af6e2add7ab346ff451dde79c1ced' into eclair-mr2-plus-aosp
* commit '2e533cc0448af6e2add7ab346ff451dde79c1ced':
Move source.properties for platform in sync with 2.0.1
Merge commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-mr2
* commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Merge commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-mr2
* commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
Merge commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7' into eclair-plus-aosp
* commit '13dbc2272e41a55f6b8de35102d60eed35c9faa7':
Move source.properties for doc in sync with 2.0.1
Merge commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-plus-aosp
* commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
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.
