OSDN Git Service
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 [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 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.
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
Android (Google) Code Review [Tue, 27 Oct 2009 00:55:49 +0000 (20:55 -0400)]
Merge change I3778cb73 into eclair
* changes:
Fix runcommand logging exception.
Brett Chabot [Mon, 26 Oct 2009 21:51:45 +0000 (14:51 -0700)]
Fix runcommand logging exception.
BUG
2215978
Android (Google) Code Review [Mon, 26 Oct 2009 23:12:43 +0000 (19:12 -0400)]
Merge change I337b2644 into eclair
* changes:
SDK Manager > AVD > Start: print computed scale.
Android (Google) Code Review [Mon, 26 Oct 2009 21:16:46 +0000 (17:16 -0400)]
Merge change I7f60270f into eclair
* changes:
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Android (Google) Code Review [Mon, 26 Oct 2009 21:05:20 +0000 (17:05 -0400)]
Merge change I25e7415f into eclair
* changes:
Add runtest --path.
Xavier Ducrohet [Mon, 26 Oct 2009 20:55:27 +0000 (13:55 -0700)]
ADT/GEL: Reenable config popup when switching from a device with only 1 config
Change-Id: I7f60270ffbcaae420f4da245ff3d9b271885fa37
BUG:
2218975
Raphael [Sun, 25 Oct 2009 00:24:33 +0000 (17:24 -0700)]
SDK Manager > AVD > Start: print computed scale.
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: I337b264437dee81aed1bb9a1fbd11ccc9f506e88
Brett Chabot [Thu, 22 Oct 2009 00:23:01 +0000 (17:23 -0700)]
Add runtest --path.
This supports specifying a file system path to test(s) to run. The path can be
a java test class file, a java package directory, or a parent directory
containing many tests.
This change allows users to run tests independently from test_defs.xml.
BUG
2133198
Raphael [Fri, 23 Oct 2009 20:32:32 +0000 (13:32 -0700)]
SDK Manager: properly reset tree when changing updates only
SDK BUG
2210573
Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
David 'Digit' Turner [Thu, 22 Oct 2009 23:59:10 +0000 (16:59 -0700)]
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
from native code through JNI.
Android (Google) Code Review [Thu, 22 Oct 2009 21:03:44 +0000 (17:03 -0400)]
Merge change Ie00595bd into eclair
* changes:
Remove runtest dependency on current dir being build top.
Dirk Dougherty [Thu, 22 Oct 2009 18:21:34 +0000 (11:21 -0700)]
am
aa95bfe2: doc change only: update gae python server script (tested)
Merge commit '
aa95bfe2ace8940d6ab3ea5f17c733addfba2e53' into eclair
* commit '
aa95bfe2ace8940d6ab3ea5f17c733addfba2e53':
doc change only: update gae python server script (tested)
Raphael [Thu, 22 Oct 2009 18:20:33 +0000 (11:20 -0700)]
am
5d2a01ad: Merge change I235da4a8 into eclair-sdk
Merge commit '
5d2a01adfe11b9513cdf5da0fd6331c8cca05947' into eclair
* commit '
5d2a01adfe11b9513cdf5da0fd6331c8cca05947':
SDK android "update project" must not require --target parameter.
Brett Chabot [Thu, 22 Oct 2009 03:01:31 +0000 (20:01 -0700)]
Remove runtest dependency on current dir being build top.
This change is necessary to support relative path based args.
Dirk Dougherty [Sat, 10 Oct 2009 00:15:52 +0000 (17:15 -0700)]
doc change only: update gae python server script (tested)
Brett Chabot [Thu, 22 Oct 2009 00:00:58 +0000 (17:00 -0700)]
Add support to run only tests in a given java package.
Android (Google) Code Review [Wed, 21 Oct 2009 22:53:58 +0000 (18:53 -0400)]
Merge change I8f6ac3c9 into eclair
* changes:
Refactor runtest test_defs to allow programmatic creation.
David 'Digit' Turner [Wed, 21 Oct 2009 21:43:09 +0000 (14:43 -0700)]
Add OpenGL 2.0 headers and libraries to the NDK.
This is only available for platform android-5. A sample
application will be available in a next patch.
Brett Chabot [Wed, 21 Oct 2009 21:23:54 +0000 (14:23 -0700)]
Refactor runtest test_defs to allow programmatic creation.
Previously a test definition could only be created via xml.
Also fix some minor lint warnings.
David 'Digit' Turner [Wed, 21 Oct 2009 17:26:03 +0000 (10:26 -0700)]
Add android-5 platform to the NDK.
For now, this is an exact copy of android-4. Another patch will
provide additionnal headers and libraries for OpenGL 2.0 plus
the relevant documentation bits and a sample app.
Android (Google) Code Review [Wed, 21 Oct 2009 21:26:32 +0000 (17:26 -0400)]
Merge change I12f05ef0 into eclair
* changes:
Add ability to retrieve instrumentations from android_manifest parser.
Android (Google) Code Review [Wed, 21 Oct 2009 21:19:40 +0000 (17:19 -0400)]
Merge change I03351f1b into eclair
* changes:
SDK Updater: switch UdpateChooserDialog to jface.
Android (Google) Code Review [Wed, 21 Oct 2009 20:09:28 +0000 (16:09 -0400)]
Merge change I235da4a8 into eclair-sdk
* changes:
SDK android "update project" must not require --target parameter.
Raphael [Wed, 21 Oct 2009 19:30:21 +0000 (12:30 -0700)]
SDK android "update project" must not require --target parameter.
SDK BUG
2203846
Change-Id: I235da4a8892de9a4334d5630667484220472f168
Raphael [Wed, 21 Oct 2009 05:14:03 +0000 (22:14 -0700)]
SDK Updater: switch UdpateChooserDialog to jface.
Change-Id: I03351f1b21b81d1654ce4ecb1c8ca5846f1fb7c4
Brett Chabot [Wed, 21 Oct 2009 18:16:42 +0000 (11:16 -0700)]
Add ability to retrieve instrumentations from android_manifest parser.
Also add a simple unit test for the parser.
David 'Digit' Turner [Wed, 21 Oct 2009 00:51:19 +0000 (17:51 -0700)]
Allow applications to target future API levels
E.g. if an application's default.properties targets android-10
then the build system will default it to the highest supported
API level found in build/platforms (e.g. android-4 currently).
Android (Google) Code Review [Tue, 20 Oct 2009 23:23:59 +0000 (19:23 -0400)]
Merge change I31f23a0b into eclair
* changes:
Remove build/platforms/android-*/common directories.
Android (Google) Code Review [Tue, 20 Oct 2009 23:18:07 +0000 (19:18 -0400)]
Merge change If7aa22af into eclair
* changes:
Remove bash-ism from build-ndk-sysroot.sh
David 'Digit' Turner [Tue, 20 Oct 2009 22:53:42 +0000 (15:53 -0700)]
Remove build/platforms/android-*/common directories.
There is little point to use symlinks to point to them from
android-*/arch-arm/usr/include. Besides, the zip file format doesn't
support symlinks which meant that each file was essentially
duplicated in the final release package.
Android (Google) Code Review [Tue, 20 Oct 2009 22:53:24 +0000 (18:53 -0400)]
Merge change I898b43fe into eclair
* changes:
Refresh NDK C library headers for all platforms
David 'Digit' Turner [Tue, 20 Oct 2009 22:33:40 +0000 (15:33 -0700)]
Remove bash-ism from build-ndk-sysroot.sh
Raphael [Tue, 20 Oct 2009 22:32:13 +0000 (15:32 -0700)]
am
d58cd1b5: Merge change I075d2eae into eclair-sdk
Merge commit '
d58cd1b5d3bfc2433201fbe22621f4924a89c04d' into eclair
* commit '
d58cd1b5d3bfc2433201fbe22621f4924a89c04d':
SDK Updater: UI polish
Raphael [Tue, 20 Oct 2009 22:32:09 +0000 (15:32 -0700)]
am
7c1adfe7: Merge change I5b1f8bca into eclair-sdk
Merge commit '
7c1adfe76fbf89cc76ff51bf0d228c13213fe563' into eclair
* commit '
7c1adfe76fbf89cc76ff51bf0d228c13213fe563':
AVD Manager: Properly disable AVD > Start > ? under Windows
David 'Digit' Turner [Tue, 20 Oct 2009 22:25:40 +0000 (15:25 -0700)]
Refresh NDK C library headers for all platforms
Android (Google) Code Review [Tue, 20 Oct 2009 22:18:18 +0000 (18:18 -0400)]
Merge change I075d2eae into eclair-sdk
* changes:
SDK Updater: UI polish
Android (Google) Code Review [Tue, 20 Oct 2009 22:16:59 +0000 (18:16 -0400)]
Merge change I5b1f8bca into eclair-sdk
* changes:
AVD Manager: Properly disable AVD > Start > ? under Windows
Raphael [Tue, 20 Oct 2009 22:09:56 +0000 (15:09 -0700)]
AVD Manager: Properly disable AVD > Start > ? under Windows
SDK BUG
2201546
Change-Id: I5b1f8bcaf57f2e7f94b4109cb62a3a5eadcd24a9
Raphael [Tue, 20 Oct 2009 21:54:30 +0000 (14:54 -0700)]
SDK Updater: UI polish
Fixes the following issues:
- Updater says it didnd't install addon and then install it
(cause: UpdaterData was looking for an ArchiveInfo in a map of Archive)
- Added a label explaining the [*] in the dependency list.
- Added the originating site to the long description in the package chooser.
- Display downloading/installing comments in the result window.
- Fixed app name in dialog when tools are updated.
Change-Id: I075d2eaeb357f33671f7e9e70a906ca48000908d
Raphael [Tue, 20 Oct 2009 20:19:58 +0000 (13:19 -0700)]
am
c9b04450: Merge change I4151529e into eclair-sdk
Merge commit '
c9b04450ef204e03de3f3da886cd45808550dfbc' into eclair
* commit '
c9b04450ef204e03de3f3da886cd45808550dfbc':
Fix potential NPE in manifest editor when switching SDKs
Raphael [Tue, 20 Oct 2009 20:19:54 +0000 (13:19 -0700)]
am
5708d157: Android.bat: remove /O in xcopy.
Merge commit '
5708d1576b3e19601804ea7dfffdee3da6c0c00d' into eclair
* commit '
5708d1576b3e19601804ea7dfffdee3da6c0c00d':
Android.bat: remove /O in xcopy.
Android (Google) Code Review [Tue, 20 Oct 2009 20:13:50 +0000 (16:13 -0400)]
Merge change I4151529e into eclair-sdk
* changes:
Fix potential NPE in manifest editor when switching SDKs
Raphael [Tue, 20 Oct 2009 19:44:18 +0000 (12:44 -0700)]
Fix potential NPE in manifest editor when switching SDKs
The UiElementNode depends on the target to compute the
description and it's entirely possible for the target to
be null while the SDK is being unloaded/reloaded.
SDK BUG
2196260
Change-Id: I4151529ea3b6a65eade47d03e55fc93cad8596d9
Raphael [Tue, 20 Oct 2009 19:16:51 +0000 (12:16 -0700)]
Android.bat: remove /O in xcopy.
It means "copy ownership". But on the Vista 64 box in the lab,
it make the xcopy of lib/x86/swt.jar fail the next time when it
was already present.
SDK BUG
2198636
Xavier Ducrohet [Mon, 19 Oct 2009 21:37:11 +0000 (14:37 -0700)]
am
fc5b5aec: Merge change I1a00abb0 into eclair-sdk
Merge commit '
fc5b5aecdeca8bb32eba9d38961b6649395f8913' into eclair
* commit '
fc5b5aecdeca8bb32eba9d38961b6649395f8913':
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Android (Google) Code Review [Mon, 19 Oct 2009 21:24:34 +0000 (17:24 -0400)]
Merge change I1a00abb0 into eclair-sdk
* changes:
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Xavier Ducrohet [Mon, 19 Oct 2009 19:56:57 +0000 (12:56 -0700)]
Fix a deadlock when ADT starts, starts building projects, and load the SDK at the same time.
Raphael [Sat, 17 Oct 2009 00:57:18 +0000 (17:57 -0700)]
am
5cff81bb: (-s ours) SDK Updater: properly update/install doc. (do not merge)
Merge commit '
5cff81bb5878d00925cbab24822123f1feebbbb8' into eclair
* commit '
5cff81bb5878d00925cbab24822123f1feebbbb8':
SDK Updater: properly update/install doc. (do not merge)
Xavier Ducrohet [Sat, 17 Oct 2009 00:57:15 +0000 (17:57 -0700)]
am
af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '
af496633406c19192db960d822b51fa1f574fbf2' into eclair
* commit '
af496633406c19192db960d822b51fa1f574fbf2':
Add save/load for the user-made Layout Devices. (do not merge)