Merge commit '75239b51770825ea3da2673d4b81be1676145d51'
* commit '75239b51770825ea3da2673d4b81be1676145d51':
docs: make the apidemos app index page only display the
Merge commit '21acc90055935d052e350fe441091091c2421010' into eclair-mr2-plus-aosp
* commit '21acc90055935d052e350fe441091091c2421010':
docs: make the apidemos app index page only display the
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-mr2
* commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2':
docs: make the apidemos app index page only display the
Merge commit '1558abd6d3706380cf4634c151ee7952e0b317fb' into eclair
* commit '1558abd6d3706380cf4634c151ee7952e0b317fb':
docs: make the apidemos app index page only display the
* 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.
Merge commit '2e00a8137d02b7478687f08431cd1f62abf17344' into eclair-mr2-plus-aosp
* commit '2e00a8137d02b7478687f08431cd1f62abf17344':
Add support for armeabi-v7a to the NDK.
Merge commit 'c7f23b570c16d99ce30b9819e28caee480795030' into eclair-mr2
* commit 'c7f23b570c16d99ce30b9819e28caee480795030':
Add support for armeabi-v7a to the NDK.
Merge commit '21c80426dd4fd1aa6fb13203e1422e562498f939'
* commit '21c80426dd4fd1aa6fb13203e1422e562498f939':
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
Merge commit '2ddbd5682b60c8604b0b85ccb280624f8845e22d' into eclair-mr2
* commit '2ddbd5682b60c8604b0b85ccb280624f8845e22d':
Update zoneinfo time zone data to version 2009s
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
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.
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.
Merge commit 'a9dcbaf1fa228731acfe13f918946f13d2e387e5'
* commit 'a9dcbaf1fa228731acfe13f918946f13d2e387e5':
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.
Merge commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12'
* commit '934b8ca57bb5d45d28450c12af3a5c765ba51c12':
Remove components that were moved to sdk.git and update build scripts.
Merge commit '01d2087c87627df5bfc7e684f62466e0a662197a' into eclair-mr2
* commit '01d2087c87627df5bfc7e684f62466e0a662197a':
Remove components that were moved to sdk.git and update build scripts.
Merge commit 'ca4432676724e715caa50958383447ad2b65f02e'
* commit 'ca4432676724e715caa50958383447ad2b65f02e':
Update build-toolchain.sh to be able to build gcc 4.4.0
Merge commit '853340a697d6fbdb1dc06ea8ad8073f228c0aa1b'
* commit '853340a697d6fbdb1dc06ea8ad8073f228c0aa1b':
Add a script to download and package the toolchain sources.
Merge commit '6ae0010c61ed927ad715de4a75e140c932e1d86a' into eclair-mr2-plus-aosp
* commit '6ae0010c61ed927ad715de4a75e140c932e1d86a':
SDK Manager: XML Schema for sdk-repository v2
Merge commit '20d0327492490b676a0a1036754e7742fb92bb69' into eclair-mr2
* commit '20d0327492490b676a0a1036754e7742fb92bb69':
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
Merge commit '5ad866dd5dd886556be67b13e3138f979816f35a' into eclair-mr2-plus-aosp
* commit '5ad866dd5dd886556be67b13e3138f979816f35a':
Update build-toolchain.sh to be able to build gcc 4.4.0
Merge commit '245c4282dbccddc611dba1ff8a2575a33f9217b5' into eclair-mr2-plus-aosp
* commit '245c4282dbccddc611dba1ff8a2575a33f9217b5':
Add a script to download and package the toolchain sources.
Merge commit 'e4df0ea14bcfc6e2d395e36970749cf9a916a0fb' into eclair-mr2
* commit 'e4df0ea14bcfc6e2d395e36970749cf9a916a0fb':
Update build-toolchain.sh to be able to build gcc 4.4.0
Merge commit 'f3ec7a02777ed9fcbe995711b8cb3f31de01d274' into eclair-mr2
* commit 'f3ec7a02777ed9fcbe995711b8cb3f31de01d274':
Add a script to download and package the toolchain sources.
Merge commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b'
* commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b':
SDK Manager: phase 1 of support for future schemas
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
