Merge commit '0431e70ddd0673ed4d9cf69d211592cb2926c076' into eclair-plus-aosp
* commit '0431e70ddd0673ed4d9cf69d211592cb2926c076':
Remove placeholder "-" label text, that was breaking the build.
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!
Merge commit 'e71c282812a870c120ff8bf0989fd78c0191eeb2' into eclair-plus-aosp
* 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 'c7f23b570c16d99ce30b9819e28caee480795030' into eclair-plus-aosp
* commit 'c7f23b570c16d99ce30b9819e28caee480795030':
Add support for armeabi-v7a to the NDK.
Merge commit '2ddbd5682b60c8604b0b85ccb280624f8845e22d' into eclair-plus-aosp
* 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 '20d0327492490b676a0a1036754e7742fb92bb69' into eclair-plus-aosp
* 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 'e4df0ea14bcfc6e2d395e36970749cf9a916a0fb' into eclair-plus-aosp
* commit 'e4df0ea14bcfc6e2d395e36970749cf9a916a0fb':
Update build-toolchain.sh to be able to build gcc 4.4.0
Merge commit 'f3ec7a02777ed9fcbe995711b8cb3f31de01d274' into eclair-plus-aosp
* commit 'f3ec7a02777ed9fcbe995711b8cb3f31de01d274':
Add a script to download and package the toolchain sources.
Merge commit '5df7d75e1c9cc73b4fe0111f89f099e8dba3486b' into eclair-plus-aosp
* 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-plus-aosp
* 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-plus-aosp
* 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
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 '5f9e0abed17ab1197a0868729232cb2c2024cef2' into eclair-plus-aosp
* commit '5f9e0abed17ab1197a0868729232cb2c2024cef2':
Rename the layout device from ION to ADP2.
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
