OSDN Git Service
Android (Google) Code Review [Thu, 19 Nov 2009 21:45:53 +0000 (13:45 -0800)]
Merge change I3f0d5eb5 into eclair
* changes:
Update the build-toolchain.sh script.
David 'Digit' Turner [Thu, 19 Nov 2009 01:03:52 +0000 (17:03 -0800)]
Update the build-toolchain.sh script.
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.
Xavier Ducrohet [Thu, 19 Nov 2009 01:07:11 +0000 (17:07 -0800)]
resolved conflicts for merge of
19cb54ea to eclair
Change-Id: I182195aeaad88aebc82988b1cec9ebda0c359bc8
Xavier Ducrohet [Tue, 17 Nov 2009 23:11:59 +0000 (15:11 -0800)]
Remove components that were moved to sdk.git and update build scripts.
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
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: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: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
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
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
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: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
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
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
Android (Google) Code Review [Sat, 14 Nov 2009 02:55:47 +0000 (18:55 -0800)]
Merge change Ic2680af0 into eclair
* changes:
Cleanup for coverage.
Brett Chabot [Sat, 14 Nov 2009 02:33:43 +0000 (18:33 -0800)]
Cleanup for coverage.
Fix constructor call in coverage.py
Remove obsolete improvider from coverage targets.
Change-Id: Ic2680af0aa84c705a6bc05a897461eeeaeeeb1cc
Android (Google) Code Review [Sat, 14 Nov 2009 01:49:55 +0000 (17:49 -0800)]
Merge change I00c840bb into eclair
* changes:
Import revised translations.
Eric Fischer [Sat, 14 Nov 2009 01:11:59 +0000 (17:11 -0800)]
Import revised translations.
Approver: jerryw
Xavier Ducrohet [Sat, 14 Nov 2009 00:27:51 +0000 (16:27 -0800)]
am
7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Merge commit '
7e48a7003ad28f8b45a45a24fc479b3a237727f1' into eclair
* commit '
7e48a7003ad28f8b45a45a24fc479b3a237727f1':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
Xavier Ducrohet [Thu, 12 Nov 2009 21:25:09 +0000 (13:25 -0800)]
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
BUG
2256562
This is integrated from eclair
Android (Google) Code Review [Fri, 13 Nov 2009 23:42:46 +0000 (15:42 -0800)]
Merge change I9a181cb7 into eclair
* changes:
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
Android Git Automerger [Fri, 13 Nov 2009 20:26:06 +0000 (12:26 -0800)]
Put this change back, false alert with build breakage
This reverts commit
a9046e418e539e208af6f3723a513666074ec6a1.
Android Git Automerger [Fri, 13 Nov 2009 19:40:40 +0000 (11:40 -0800)]
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
This reverts commit
18e1486a2749055414579f487b125021eb79b8ca.
Raphael [Fri, 13 Nov 2009 01:15:54 +0000 (17:15 -0800)]
SDK Manager: fix, create temp folder before download
SDK BUG
2258237
Change-Id: I361fb688558539e20af50cd0a1d805ddf4ea4828
Jason Sams [Thu, 12 Nov 2009 22:10:30 +0000 (14:10 -0800)]
Remove surface from rs init and handle surfaceChanged correctly.
Xavier Ducrohet [Thu, 12 Nov 2009 21:25:09 +0000 (13:25 -0800)]
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
BUG
2256562
Change-Id: I9a181cb799b1eadc027d6357c100fc4dfb0db012
Brett Chabot [Thu, 12 Nov 2009 19:47:16 +0000 (11:47 -0800)]
Add contacts launch performance test definition.
Change-Id: I8d4376e676a682c59accbb129a4d77efb5696e28
Android (Google) Code Review [Wed, 11 Nov 2009 19:20:09 +0000 (11:20 -0800)]
Merge change I6fd4cd01 into eclair
* changes:
Add an overlay to make the latinIME the default one in the SDK
Xavier Ducrohet [Wed, 11 Nov 2009 02:14:11 +0000 (18:14 -0800)]
Add an overlay to make the latinIME the default one in the SDK
BUG
2225111
Change-Id: I6fd4cd0159f1eb90b78e3398a8e97d74d6396f9f
Fred Quintana [Mon, 9 Nov 2009 23:47:36 +0000 (15:47 -0800)]
make consistent with new RegisteredServicesCache API
Marco Nelissen [Mon, 9 Nov 2009 23:45:02 +0000 (15:45 -0800)]
Update live wallpaper examples to new api.
Raphael [Mon, 9 Nov 2009 19:59:37 +0000 (11:59 -0800)]
am
8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '
8ccddf4c00464c6fee998d56da1f08b4662abf62' into eclair
* commit '
8ccddf4c00464c6fee998d56da1f08b4662abf62':
SDK Manager: reuse complete downloads, retry Windows locks.
Android (Google) Code Review [Mon, 9 Nov 2009 16:58:40 +0000 (08:58 -0800)]
Merge change I53c8228b into eclair
* changes:
Fix type of _id col in SearchableDictionary
Android (Google) Code Review [Mon, 9 Nov 2009 01:02:05 +0000 (17:02 -0800)]
Merge change I68a71c11 into eclair
* changes:
Add Japanese font to SDK.
Xavier Ducrohet [Sun, 8 Nov 2009 23:15:37 +0000 (15:15 -0800)]
Add Japanese font to SDK.
BUG
2041229
Change-Id: I68a71c11ae4f61c987a888dadf205f585b577c61
Brett Chabot [Sun, 8 Nov 2009 21:46:35 +0000 (13:46 -0800)]
Update adt-tests build.properties to include new test data location.
Missed this file in the 31885 commit.
Android (Google) Code Review [Sun, 8 Nov 2009 21:34:15 +0000 (13:34 -0800)]
Merge change Id49751eb into eclair-sdk
* changes:
SDK Manager: reuse complete downloads, retry Windows locks.
Android (Google) Code Review [Sat, 7 Nov 2009 20:40:26 +0000 (15:40 -0500)]
Merge change If5b2f9df into eclair
* changes:
Fix ADT test data references.
Raphael [Sat, 7 Nov 2009 02:55:04 +0000 (18:55 -0800)]
SDK Manager: reuse complete downloads, retry Windows locks.
This resolves 2 main issues with the SDK updater:
- Completed downloads are not cleared till the install is successful
- They are also stored in SDK/temp rather than the real Windows TEMP
folder, making them more discoverable for savvy users.
- There's a retry loop on failed install when due to a directory
being locked.
- The retry loop comes with the a Big Fat Warning[tm] in a modal
dialog box. You can't miss it. And it explicitly mentions the
antivirus software can be the root cause.
SDK BUG
2235058
Change-Id: Id49751ebd67e7291a0e7005136b22576335729c1
Raphael [Sat, 7 Nov 2009 00:13:41 +0000 (16:13 -0800)]
am
8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '
8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair
* commit '
8e3442f1b0fc19c8213978d4e7ac005774462297':
SDK Manager: refresh sources when HTTP/S pref is changed.
Android (Google) Code Review [Sat, 7 Nov 2009 00:06:48 +0000 (19:06 -0500)]
Merge change Ic291d534 into eclair-sdk
* changes:
SDK Manager: refresh sources when HTTP/S pref is changed.
Raphael [Fri, 6 Nov 2009 23:18:57 +0000 (15:18 -0800)]
SDK Manager: refresh sources when HTTP/S pref is changed.
Currently you need to use the Refresh button in the remote page
after you change the HTTP/s setting and many users think
instead they need to close/restart the SDK manager.
Change-Id: Ic291d53459624558910bbc417295df5ddc7b037d
Raphael [Fri, 6 Nov 2009 22:00:55 +0000 (14:00 -0800)]
am
ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '
ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair
* commit '
ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Raphael [Fri, 6 Nov 2009 21:42:28 +0000 (13:42 -0800)]
SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d
Android (Google) Code Review [Fri, 6 Nov 2009 19:08:24 +0000 (14:08 -0500)]
Merge change I793a35a9 into eclair
* changes:
ADT now launches app as if launched from launcher.
Xavier Ducrohet [Fri, 6 Nov 2009 02:38:04 +0000 (18:38 -0800)]
ADT now launches app as if launched from launcher.
BUG
2243142
Change-Id: I793a35a92cf0f818242e74e4794d74a681b25d83
Android (Google) Code Review [Fri, 6 Nov 2009 18:15:45 +0000 (13:15 -0500)]
Merge change I1fa1ae88 into eclair
* changes:
Move Tools to rev 5, and ADT to 0.9.5
Xavier Ducrohet [Fri, 6 Nov 2009 18:05:53 +0000 (10:05 -0800)]
Move Tools to rev 5, and ADT to 0.9.5
Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445
Android (Google) Code Review [Thu, 5 Nov 2009 19:16:08 +0000 (14:16 -0500)]
Merge change I85aa2b1d into eclair
* changes:
create a test app that allows direct control of a sync adapter for testing purposes
Fred Quintana [Wed, 4 Nov 2009 01:18:33 +0000 (17:18 -0800)]
create a test app that allows direct control of a sync adapter for testing purposes
http://b/issue?id=
2239791
Xavier Ducrohet [Wed, 4 Nov 2009 23:05:34 +0000 (15:05 -0800)]
am
7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '
7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair
* commit '
7f305ce77069cf8432374f12392a3ce3a476bdce':
Ignore hidden files and vi swap files during packaging. (do not merge)
Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]
Ignore hidden files and vi swap files during packaging. (do not merge)
BUG #
2233458
This is integrated from eclair.
Bjorn Bringert [Tue, 3 Nov 2009 15:37:36 +0000 (15:37 +0000)]
Fix type of _id col in SearchableDictionary
SDK SAMPLE CODE ONLY
Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.
Fixes http://b/issue?id=
2219970
Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
Brett Chabot [Tue, 3 Nov 2009 20:29:42 +0000 (12:29 -0800)]
Fix ADT test data references.
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
Raphael [Tue, 3 Nov 2009 20:17:52 +0000 (12:17 -0800)]
am
4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '
4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair
* commit '
4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Xavier Ducrohet [Tue, 3 Nov 2009 18:52:54 +0000 (10:52 -0800)]
Move check for hidden files in the proper method.
Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148
Raphael [Tue, 3 Nov 2009 17:40:55 +0000 (09:40 -0800)]
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG
2233458
Android (Google) Code Review [Tue, 3 Nov 2009 07:06:32 +0000 (02:06 -0500)]
Merge change If0d0751e into eclair
* changes:
Ignore hidden files and vi swap files during packaging.
Xavier Ducrohet [Tue, 3 Nov 2009 02:31:46 +0000 (18:31 -0800)]
Ignore hidden files and vi swap files during packaging.
BUG #
2233458
Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
Android (Google) Code Review [Tue, 3 Nov 2009 01:08:06 +0000 (20:08 -0500)]
Merge change Ida443c07 into eclair
* changes:
Remove calendar provider suite from continuous. DO NOT MERGE
Raphael [Mon, 2 Nov 2009 22:54:29 +0000 (14:54 -0800)]
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
SDK BUG
2232091
Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5
Xavier Ducrohet [Mon, 2 Nov 2009 20:34:39 +0000 (12:34 -0800)]
am
0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair
* commit '
0dd85d89fa90de0d79da296292f75ceb5cf48b92':
Only apply permission to files with +x (do not merge)
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x (do not merge)
integrated from eclair branch.
Android (Google) Code Review [Mon, 2 Nov 2009 19:40:10 +0000 (14:40 -0500)]
Merge change Ied3304a0 into eclair
* changes:
Only apply permission to files with +x
Brett Chabot [Sat, 31 Oct 2009 00:20:49 +0000 (17:20 -0700)]
Remove calendar provider suite from continuous. DO NOT MERGE
Bug
2171501
Xavier Ducrohet [Fri, 30 Oct 2009 23:34:47 +0000 (16:34 -0700)]
Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
Raphael [Fri, 30 Oct 2009 20:01:22 +0000 (13:01 -0700)]
am
d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair
* commit '
d3f9eb79c79752b76e483d5d6774b76bcf91a8de':
SDK Manager: Display error when saving settings
Raphael [Fri, 30 Oct 2009 04:20:41 +0000 (21:20 -0700)]
SDK Manager: Display error when saving settings
SDK BUG
2226029
Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
Android (Google) Code Review [Thu, 29 Oct 2009 21:49:26 +0000 (17:49 -0400)]
Merge change Iae0bc856 into eclair
* changes:
A sample application that demonstrates use of legacy and current contacts APIs.
Raphael [Thu, 29 Oct 2009 21:31:05 +0000 (14:31 -0700)]
am
be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit '
be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair
* commit '
be4cbcc2267e3778776c68785b52f871f72c67f7':
SDK Manager: fix NPE in AVD > Start when there's no skin name.
Dmitri Plotnikov [Thu, 29 Oct 2009 01:36:32 +0000 (18:36 -0700)]
A sample application that demonstrates use of legacy and current contacts APIs.
The application provides two implementations for access to contacts, one based
on legacy API, the other based on the current API. The correct implementation
is chosen at runtime based on the version of the SDK.
Change-Id: Iae0bc8564be420ff504a5dc760b935630a7664e6
Raphael [Thu, 29 Oct 2009 20:52:56 +0000 (13:52 -0700)]
SDK Manager: fix NPE in AVD > Start when there's no skin name.
Also log missing config.ini path.
SDK BUG
2223760
Change-Id: I4517005e03e90c0b5a52bcb40b0d32eddd03c1f3
Android (Google) Code Review [Thu, 29 Oct 2009 20:45:53 +0000 (16:45 -0400)]
Merge change Ia94518e3 into eclair
* changes:
ADT test fixes.
Raphael [Thu, 29 Oct 2009 20:30:46 +0000 (13:30 -0700)]
am
940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit '
940073e267695a7c4a404cb2174b48e893c15a45' into eclair
* commit '
940073e267695a7c4a404cb2174b48e893c15a45':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Raphael [Thu, 29 Oct 2009 20:30:39 +0000 (13:30 -0700)]
am
dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit '
dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e' into eclair
* commit '
dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e':
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Android (Google) Code Review [Thu, 29 Oct 2009 20:22:26 +0000 (16:22 -0400)]
Merge change I28aa1104 into eclair-sdk
* changes:
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Android (Google) Code Review [Thu, 29 Oct 2009 20:14:35 +0000 (16:14 -0400)]
Merge change I6b97fee0 into eclair-sdk
* changes:
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
Xavier Ducrohet [Thu, 29 Oct 2009 20:09:24 +0000 (13:09 -0700)]
am
3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit '
3c5557bb5e9235737c4c7ddda4c66f14396105cf' into eclair
* commit '
3c5557bb5e9235737c4c7ddda4c66f14396105cf':
Move SDK tools package to r4
Android (Google) Code Review [Thu, 29 Oct 2009 20:00:32 +0000 (16:00 -0400)]
Merge change Idd4c6e5f into eclair-sdk
* changes:
Move SDK tools package to r4
Raphael [Thu, 29 Oct 2009 20:00:11 +0000 (13:00 -0700)]
SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.
Change-Id: I6b97fee06bd4e6dc36c977ffef3c25315469b766
Raphael [Thu, 29 Oct 2009 19:56:16 +0000 (12:56 -0700)]
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS
2219284 2198427
Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
Xavier Ducrohet [Thu, 29 Oct 2009 19:39:03 +0000 (12:39 -0700)]
am
275de810: Merge change I2089d86d into eclair-sdk
Merge commit '
275de810e99814cefd11321fd934bda1a4b53cc9' into eclair
* commit '
275de810e99814cefd11321fd934bda1a4b53cc9':
Fix the android launcher script to not force Java 1.5 on MacOS
Android (Google) Code Review [Thu, 29 Oct 2009 19:28:07 +0000 (15:28 -0400)]
Merge change I2089d86d into eclair-sdk
* changes:
Fix the android launcher script to not force Java 1.5 on MacOS
Xavier Ducrohet [Thu, 29 Oct 2009 19:27:50 +0000 (12:27 -0700)]
Move SDK tools package to r4
Xavier Ducrohet [Thu, 29 Oct 2009 18:40:20 +0000 (11:40 -0700)]
Fix the android launcher script to not force Java 1.5 on MacOS
Brett Chabot [Thu, 29 Oct 2009 01:22:15 +0000 (18:22 -0700)]
ADT test fixes.
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.
Bugs
2222616,
2218682
Android (Google) Code Review [Wed, 28 Oct 2009 00:57:02 +0000 (20:57 -0400)]
Merge change Ie496edfa into eclair
* changes:
SDK Updater: don't load sdk-repo XML that failed to validate.
Raphael [Tue, 27 Oct 2009 22:28:34 +0000 (15:28 -0700)]
SDK Updater: don't load sdk-repo XML that failed to validate.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.
SDK BUGS
2219284 2198427
Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
Raphael [Tue, 27 Oct 2009 22:33:17 +0000 (15:33 -0700)]
Prepare version numbers for next SDK & tools
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd