OSDN Git Service
Xavier Ducrohet [Wed, 10 Feb 2010 23:22:11 +0000 (15:22 -0800)]
Add support for external jar files in library project.
Bug:
2294012
Change-Id: I88bc99d9c3ac4135aac4c5af7995aca25bf5c4ee
Xavier Ducrohet [Wed, 10 Feb 2010 18:34:20 +0000 (10:34 -0800)]
Merge "Add support for library project in the Ant build system." into sdk-dev
Xavier Ducrohet [Wed, 3 Feb 2010 19:52:04 +0000 (11:52 -0800)]
Add support for library project in the Ant build system.
new build rules file for library only. Should probably extract
the parts that are common to this and the default rules file.
SetupTask now sets up some properties and Path reference based
on the libraries.
They are used by:
- aapt task (now also used for the generation of R.java) which
use all the res folders of the main project and the libraries,
and generate an R class for the project and the libraries.
- javac which compiles the src/ folders of the libraries.
Bug:
2294012
Change-Id: Ie550dcf0ba8ea57696ebb1c2a61d4c6d73307bdf
Raphael [Thu, 4 Feb 2010 23:13:38 +0000 (15:13 -0800)]
ADT NPW: Fix dialog title for New Android Test Project
SDK Bug:
2420637
Change-Id: I321cb49ecf1e11f0619c769c211338c55552d108
Raphael [Wed, 3 Feb 2010 23:45:10 +0000 (15:45 -0800)]
Windows SDK create bridge doesn't need to request layoutlib.jar
Change-Id: Icaa3cb2367ac57041ba5bb7df787ee51374fd0b8
Xavier Ducrohet [Wed, 3 Feb 2010 19:46:53 +0000 (11:46 -0800)]
am
bd213eb2: am
5a99e2a9: Merge "Fix sorting of Sample-type packages" into eclair
Merge commit '
bd213eb273952e1c1bb05fc4f07422e923b526f2'
* commit '
bd213eb273952e1c1bb05fc4f07422e923b526f2':
Fix sorting of Sample-type packages
Xavier Ducrohet [Wed, 3 Feb 2010 19:43:57 +0000 (11:43 -0800)]
am
5a99e2a9: Merge "Fix sorting of Sample-type packages" into eclair
Merge commit '
5a99e2a96fe013562a71b222dc596f47045650c6' into eclair-plus-aosp
* commit '
5a99e2a96fe013562a71b222dc596f47045650c6':
Fix sorting of Sample-type packages
Xavier Ducrohet [Wed, 3 Feb 2010 19:40:58 +0000 (11:40 -0800)]
Merge "Fix sorting of Sample-type packages" into eclair
Xavier Ducrohet [Wed, 3 Feb 2010 07:09:36 +0000 (23:09 -0800)]
am
a384f42a: am
61c0fc73: Merge "Fixed feature icon and plug-ins exported package lists." into eclair
Merge commit '
a384f42a37f84c1b50774b68bdea5ddd94bc8777'
* commit '
a384f42a37f84c1b50774b68bdea5ddd94bc8777':
Fixed feature icon and plug-ins exported package lists.
Xavier Ducrohet [Wed, 3 Feb 2010 07:09:33 +0000 (23:09 -0800)]
Xavier Ducrohet [Wed, 3 Feb 2010 04:57:37 +0000 (20:57 -0800)]
am
61c0fc73: Merge "Fixed feature icon and plug-ins exported package lists." into eclair
Merge commit '
61c0fc7326396fbb01a8de5156ced61a2336ed9d' into eclair-plus-aosp
* commit '
61c0fc7326396fbb01a8de5156ced61a2336ed9d':
Fixed feature icon and plug-ins exported package lists.
Xavier Ducrohet [Wed, 3 Feb 2010 04:57:34 +0000 (20:57 -0800)]
am
aac1ef57: Update SDK change log.
Merge commit '
aac1ef57789bb85432aa104832815c818a9acde6' into eclair-plus-aosp
* commit '
aac1ef57789bb85432aa104832815c818a9acde6':
Update SDK change log.
Xavier Ducrohet [Wed, 3 Feb 2010 01:10:17 +0000 (17:10 -0800)]
Merge "Fixed feature icon and plug-ins exported package lists." into eclair
Xavier Ducrohet [Wed, 3 Feb 2010 01:03:36 +0000 (17:03 -0800)]
Fixed feature icon and plug-ins exported package lists.
Change-Id: Ie5de78e8546baa2a7ed16fc0cd8278b6553ee6a1
Xavier Ducrohet [Wed, 3 Feb 2010 00:12:04 +0000 (16:12 -0800)]
Fix sorting of Sample-type packages
Also sort the list of local packages.
Bug:
2414760
Change-Id: I0a25d5985db76d561bd312682ac1ce31eafaf560
Xavier Ducrohet [Wed, 3 Feb 2010 00:22:17 +0000 (16:22 -0800)]
am
987c9e13: am
8b02c04f: Merge "ADT: Refreshed some icons." into eclair
Merge commit '
987c9e13fd436ad68031ddae84598d5e67069298'
* commit '
987c9e13fd436ad68031ddae84598d5e67069298':
ADT: Refreshed some icons.
Xavier Ducrohet [Wed, 3 Feb 2010 00:22:14 +0000 (16:22 -0800)]
am
6eb8f849: (-s ours) am
3b9b9b56: Add support for VMs that can stream hprof data through JDWP. Do not merge
Merge commit '
6eb8f849f3711d523c84655914ee360018804b7f'
* commit '
6eb8f849f3711d523c84655914ee360018804b7f':
Add support for VMs that can stream hprof data through JDWP. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 22:21:23 +0000 (14:21 -0800)]
am
8b02c04f: Merge "ADT: Refreshed some icons." into eclair
Merge commit '
8b02c04fa9ad496c6b46ae98496615c85656a489' into eclair-plus-aosp
* commit '
8b02c04fa9ad496c6b46ae98496615c85656a489':
ADT: Refreshed some icons.
Xavier Ducrohet [Tue, 2 Feb 2010 22:21:19 +0000 (14:21 -0800)]
am
3b9b9b56: Add support for VMs that can stream hprof data through JDWP. Do not merge
Merge commit '
3b9b9b5678aa54cc82621a8563079fc13d5fa8e4' into eclair-plus-aosp
* commit '
3b9b9b5678aa54cc82621a8563079fc13d5fa8e4':
Add support for VMs that can stream hprof data through JDWP. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 21:34:18 +0000 (13:34 -0800)]
Update SDK change log.
Change-Id: I3c033f68f79845085cf64daa44ff273c4a52a3d1
Xavier Ducrohet [Tue, 2 Feb 2010 21:06:42 +0000 (13:06 -0800)]
Merge "ADT: Refreshed some icons." into eclair
Xavier Ducrohet [Tue, 2 Feb 2010 00:32:57 +0000 (16:32 -0800)]
ADT: Refreshed some icons.
Getting rid of the goldish round icon with the a inside as it's not
used anywhere on android.com
Change-Id: I7ea0e4de1df973baedc41c2a1ca8918f51c25f75
Xavier Ducrohet [Sat, 30 Jan 2010 02:11:14 +0000 (18:11 -0800)]
Add support for VMs that can stream hprof data through JDWP. Do not merge
Integrated from master for inclusion in the SDK Tools r5
Change-Id: Ifad984f5b0ae187428cb7d871b039dddf0db4ba7
Raphael Moll [Tue, 2 Feb 2010 17:38:21 +0000 (09:38 -0800)]
am
e9084525: am
8406d9b8: Merge "SDK Manager: apply settings instantaneously." into eclair
Merge commit '
e9084525a0d2c01c77b0135277b9478a3c34f4ce'
* commit '
e9084525a0d2c01c77b0135277b9478a3c34f4ce':
SDK Manager: apply settings instantaneously.
Xavier Ducrohet [Tue, 2 Feb 2010 17:38:17 +0000 (09:38 -0800)]
am
b4e91253: (-s ours) am
d9c0fde0: Merge "Strawman support for streaming hprof dumps. Do not merge" into eclair
Merge commit '
b4e9125365d975626cb0d6fdb3ea29f26c0f6861'
* commit '
b4e9125365d975626cb0d6fdb3ea29f26c0f6861':
Strawman support for streaming hprof dumps. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 17:38:11 +0000 (09:38 -0800)]
am
8b17f918: am
232ddc3c: Merge "Fix \'android create test-project\' to handle parent projects with missing default.prop" into eclair
Merge commit '
8b17f918e5fbfd52f9c4c16a59b011f2c85e8f0a'
* commit '
8b17f918e5fbfd52f9c4c16a59b011f2c85e8f0a':
Fix 'android create test-project' to handle parent projects with missing default.prop
Raphael [Tue, 2 Feb 2010 17:38:07 +0000 (09:38 -0800)]
am
be69e620: am
9783ea31: SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Merge commit '
be69e620db2081c1c559458aff24080f30596e20'
* commit '
be69e620db2081c1c559458aff24080f30596e20':
SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Raphael [Tue, 2 Feb 2010 17:38:00 +0000 (09:38 -0800)]
am
4ae8aec6: am
0b9f1ace: SDK Updater: ask for confirmation before wiping modified samples.
Merge commit '
4ae8aec6c7ecc1117cc6e3a3584dab0e5aff8a98'
* commit '
4ae8aec6c7ecc1117cc6e3a3584dab0e5aff8a98':
SDK Updater: ask for confirmation before wiping modified samples.
Raphael Moll [Tue, 2 Feb 2010 03:01:41 +0000 (19:01 -0800)]
am
8406d9b8: Merge "SDK Manager: apply settings instantaneously." into eclair
Merge commit '
8406d9b88bccec370d3e9a208e0f1e3990772ddb' into eclair-plus-aosp
* commit '
8406d9b88bccec370d3e9a208e0f1e3990772ddb':
SDK Manager: apply settings instantaneously.
Raphael Moll [Tue, 2 Feb 2010 02:57:48 +0000 (18:57 -0800)]
Merge "SDK Manager: apply settings instantaneously." into eclair
Raphael [Tue, 2 Feb 2010 02:15:05 +0000 (18:15 -0800)]
SDK Manager: apply settings instantaneously.
SDK Bug:
2411665
Change-Id: I6d4a38f4f2d974a727d8e0891d63618d82c578ad
Xavier Ducrohet [Tue, 2 Feb 2010 02:10:39 +0000 (18:10 -0800)]
am
d9c0fde0: Merge "Strawman support for streaming hprof dumps. Do not merge" into eclair
Merge commit '
d9c0fde00d1cc01abbff3e7f61a6fdb59807c5c9' into eclair-plus-aosp
* commit '
d9c0fde00d1cc01abbff3e7f61a6fdb59807c5c9':
Strawman support for streaming hprof dumps. Do not merge
Xavier Ducrohet [Tue, 2 Feb 2010 02:06:40 +0000 (18:06 -0800)]
Merge "Strawman support for streaming hprof dumps. Do not merge" into eclair
Xavier Ducrohet [Mon, 1 Feb 2010 23:48:39 +0000 (15:48 -0800)]
am
232ddc3c: Merge "Fix \'android create test-project\' to handle parent projects with missing default.prop" into eclair
Merge commit '
232ddc3cc681f1e40b98fb8abc8be25beb509245' into eclair-plus-aosp
* commit '
232ddc3cc681f1e40b98fb8abc8be25beb509245':
Fix 'android create test-project' to handle parent projects with missing default.prop
Xavier Ducrohet [Mon, 1 Feb 2010 23:43:47 +0000 (15:43 -0800)]
Merge "Fix 'android create test-project' to handle parent projects with missing default.prop" into eclair
Raphael [Mon, 1 Feb 2010 23:35:51 +0000 (15:35 -0800)]
am
9783ea31: SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Merge commit '
9783ea31375cff1954190ff5bddfba880f2da02b' into eclair-plus-aosp
* commit '
9783ea31375cff1954190ff5bddfba880f2da02b':
SDK Manager: fix android.bat to correctly work on 64bit JVMs.
Raphael [Mon, 1 Feb 2010 23:35:48 +0000 (15:35 -0800)]
am
0b9f1ace: SDK Updater: ask for confirmation before wiping modified samples.
Merge commit '
0b9f1ace93062a769c6ed2a963d7f3e9d839cb22' into eclair-plus-aosp
* commit '
0b9f1ace93062a769c6ed2a963d7f3e9d839cb22':
SDK Updater: ask for confirmation before wiping modified samples.
Xavier Ducrohet [Mon, 1 Feb 2010 23:12:56 +0000 (15:12 -0800)]
Fix 'android create test-project' to handle parent projects with missing default.prop
Bug:
2411562
Change-Id: Ia22491d56dfa3c5dda700782c28a2bcbfeebd266
Raphael [Mon, 1 Feb 2010 21:39:41 +0000 (13:39 -0800)]
SDK Manager: fix android.bat to correctly work on 64bit JVMs.
SDK Bug: http://b.android.com/3917
Change-Id: I4a72a3c16ddeb9ab331342de7a72cc5ae61e8cdc
Raphael [Sat, 30 Jan 2010 06:25:55 +0000 (22:25 -0800)]
SDK Updater: ask for confirmation before wiping modified samples.
SDK Bug:
2401466
Change-Id: I09d596b44b3daf3a079c51f76db3f9f8d376a8b3
Xavier Ducrohet [Sat, 30 Jan 2010 02:11:14 +0000 (18:11 -0800)]
Add support for VMs that can stream hprof data through JDWP.
Change-Id: I0fcc8718685ddb7accd459e78821677f044135ba
Xavier Ducrohet [Sat, 30 Jan 2010 01:57:44 +0000 (17:57 -0800)]
am
db173b4b: am
f89bdfe5: Fix https download for the standalone version of the SDK Updater
Merge commit '
db173b4b6618c7cec316214cc3b4fba277ad4112'
* commit '
db173b4b6618c7cec316214cc3b4fba277ad4112':
Fix https download for the standalone version of the SDK Updater
Xavier Ducrohet [Sat, 30 Jan 2010 01:54:44 +0000 (17:54 -0800)]
am
f89bdfe5: Fix https download for the standalone version of the SDK Updater
Merge commit '
f89bdfe5b20157a284bf374d4d2e067e3ae2b9d8' into eclair-plus-aosp
* commit '
f89bdfe5b20157a284bf374d4d2e067e3ae2b9d8':
Fix https download for the standalone version of the SDK Updater
Xavier Ducrohet [Fri, 29 Jan 2010 21:53:40 +0000 (13:53 -0800)]
Fix https download for the standalone version of the SDK Updater
The problem was due to the launch script completely replacing
java.ext.dirs preventing the VM from accessing the optional
jce.jar package (Java Cryptography Extension).
The launch script now queries the JVM for the current value
of java.ext.dirs (using archquery) to append to it instead
of replacing it.
In order to do that, archquery.jar now outputs only the value
of the queried system property instead of output "name=value"
Bug:
2248892
Change-Id: If17d48e46529bebc1a25daf99f2748e9ec81a214
Raphael Moll [Sat, 30 Jan 2010 01:29:13 +0000 (17:29 -0800)]
am
74d66e2d: am
5f225229: Merge "SDK Updater: Support post install script for updating SDK Setup.exe." into eclair
Merge commit '
74d66e2d7f810028620f25c585a3f21e5ad1686b'
* commit '
74d66e2d7f810028620f25c585a3f21e5ad1686b':
SDK Updater: Support post install script for updating SDK Setup.exe.
Raphael [Sat, 30 Jan 2010 01:29:08 +0000 (17:29 -0800)]
am
183565b0: am
8a81794e: ADT NPW: disable auto-selection of minSdkVersion vs target.
Merge commit '
183565b05a814a1cce84850bf102e8593d3dbaff'
* commit '
183565b05a814a1cce84850bf102e8593d3dbaff':
ADT NPW: disable auto-selection of minSdkVersion vs target.
Raphael Moll [Sat, 30 Jan 2010 01:22:25 +0000 (17:22 -0800)]
am
5f225229: Merge "SDK Updater: Support post install script for updating SDK Setup.exe." into eclair
Merge commit '
5f2252290bb88c6552b28ea4b9f2fafae5a49610' into eclair-plus-aosp
* commit '
5f2252290bb88c6552b28ea4b9f2fafae5a49610':
SDK Updater: Support post install script for updating SDK Setup.exe.
Raphael [Sat, 30 Jan 2010 01:21:01 +0000 (17:21 -0800)]
am
8a81794e: ADT NPW: disable auto-selection of minSdkVersion vs target.
Merge commit '
8a81794e0b9a13e0ebf487a0936d34432f37a6ec' into eclair-plus-aosp
* commit '
8a81794e0b9a13e0ebf487a0936d34432f37a6ec':
ADT NPW: disable auto-selection of minSdkVersion vs target.
Raphael Moll [Sat, 30 Jan 2010 01:17:08 +0000 (17:17 -0800)]
Merge "SDK Updater: Support post install script for updating SDK Setup.exe." into eclair
Andy McFadden [Fri, 29 Jan 2010 21:12:54 +0000 (13:12 -0800)]
Strawman support for streaming hprof dumps. Do not merge
Send an HPDS instead of HPDU when the client VM supports it. Once
additional support is added to DDMS, this will allow grabbing an hprof
dump through DDMS even if the target app doesn't have permission to write
to /sdcard. (The down side is that the dump must be held on the native
heap while it's generated, temporarily bloating the process by a few
megabytes.)
Integrated from master for inclusion in the SDK Tools r5
For bug
2092855.
Change-Id: I54492c62cce3c52b0ac523f6e87b9438d2ab92c0
Andy McFadden [Fri, 29 Jan 2010 21:12:54 +0000 (13:12 -0800)]
Strawman support for streaming hprof dumps.
Send an HPDS instead of HPDU when the client VM supports it. Once
additional support is added to DDMS, this will allow grabbing an hprof
dump through DDMS even if the target app doesn't have permission to write
to /sdcard. (The down side is that the dump must be held on the native
heap while it's generated, temporarily bloating the process by a few
megabytes.)
For bug
2092855.
Raphael [Fri, 29 Jan 2010 06:41:34 +0000 (22:41 -0800)]
ADT NPW: disable auto-selection of minSdkVersion vs target.
Target was updating minSdkVersion.
minSdkVersion was updating target.
The whole thing looks confusing to use and has too many
edge cases, so the code is just disabled right now.
We might as well remove it later.
SDK Bug:
2392173
Change-Id: Ia2eaaa0238ff7fc428e6ed5635df80fc4e766e97
Raphael [Fri, 29 Jan 2010 04:06:46 +0000 (20:06 -0800)]
SDK Updater: Support post install script for updating SDK Setup.exe.
The new post_tools_install.bat will be found in SDK/tools/lib.
This also moves find_java.bat into the same lib folder.
SDK Bug:
2404830
Change-Id: I84e3671918931079f296500e296ec1a55931b851
Xavier Ducrohet [Thu, 28 Jan 2010 23:31:40 +0000 (15:31 -0800)]
am
77784b30: (-s ours) am
53283c2d: Display VM message on profiling error. Do not merge
Merge commit '
77784b3091975b4cebfc169f82afdbcf879896a1'
* commit '
77784b3091975b4cebfc169f82afdbcf879896a1':
Display VM message on profiling error. Do not merge
Xavier Ducrohet [Thu, 28 Jan 2010 23:31:32 +0000 (15:31 -0800)]
am
43ed0cb5: (-s ours) am
b752b6ca: DDMS: Add support for profiling with VM able to send the result through JDWP. Do not merge.
Merge commit '
43ed0cb531a5ffff843375c03fe02edc7f85ec83'
* commit '
43ed0cb531a5ffff843375c03fe02edc7f85ec83':
DDMS: Add support for profiling with VM able to send the result through JDWP. Do not merge.
Andy McFadden [Thu, 28 Jan 2010 23:31:27 +0000 (15:31 -0800)]
am
41e44ee2: (-s ours) am
54fa045c: Strawman support for streaming method profiling. do not merge.
Merge commit '
41e44ee29818873554605bb0dbd06b12ea213eaf'
* commit '
41e44ee29818873554605bb0dbd06b12ea213eaf':
Strawman support for streaming method profiling. do not merge.
Raphael Moll [Thu, 28 Jan 2010 23:31:22 +0000 (15:31 -0800)]
am
2b7a00d4: am
29e98002: Merge "SDK Launcher: capture stdout from batch file." into eclair
Merge commit '
2b7a00d4dd82ab5db15249150bb36c9d09db1cb3'
* commit '
2b7a00d4dd82ab5db15249150bb36c9d09db1cb3':
SDK Launcher: capture stdout from batch file.
Xavier Ducrohet [Thu, 28 Jan 2010 23:17:31 +0000 (15:17 -0800)]
am
53283c2d: Display VM message on profiling error. Do not merge
Merge commit '
53283c2d209c6f4114f1ea0462f8b6f2f9f5cc43' into eclair-plus-aosp
* commit '
53283c2d209c6f4114f1ea0462f8b6f2f9f5cc43':
Display VM message on profiling error. Do not merge
Xavier Ducrohet [Thu, 28 Jan 2010 23:17:28 +0000 (15:17 -0800)]
am
b752b6ca: DDMS: Add support for profiling with VM able to send the result through JDWP. Do not merge.
Merge commit '
b752b6ca3e8b3553e8ede1344c3b3b4aa13b825d' into eclair-plus-aosp
* commit '
b752b6ca3e8b3553e8ede1344c3b3b4aa13b825d':
DDMS: Add support for profiling with VM able to send the result through JDWP. Do not merge.
Andy McFadden [Thu, 28 Jan 2010 23:17:23 +0000 (15:17 -0800)]
am
54fa045c: Strawman support for streaming method profiling. do not merge.
Merge commit '
54fa045cb564de89ea474d5076a1f220664330fd' into eclair-plus-aosp
* commit '
54fa045cb564de89ea474d5076a1f220664330fd':
Strawman support for streaming method profiling. do not merge.
Raphael Moll [Thu, 28 Jan 2010 23:10:11 +0000 (15:10 -0800)]
am
ad354bd4: am
f717e68d: Merge "SDK Updater: prevent potential NPE." into eclair
Merge commit '
ad354bd41c1f47d84eb0da44e0308816a78cf584'
* commit '
ad354bd41c1f47d84eb0da44e0308816a78cf584':
SDK Updater: prevent potential NPE.
Xavier Ducrohet [Thu, 28 Jan 2010 23:10:07 +0000 (15:10 -0800)]
am
637f8fd1: am
f7f9e459: Merge "Add support for the -0 aapt option in the custom Ant task for aapt." into eclair
Merge commit '
637f8fd13bf3db1316245749b81b74f218440b38'
* commit '
637f8fd13bf3db1316245749b81b74f218440b38':
Add support for the -0 aapt option in the custom Ant task for aapt.
Xavier Ducrohet [Thu, 28 Jan 2010 23:10:03 +0000 (15:10 -0800)]
am
99d9b70c: am
cb2261e8: Merge "Fix ADT Build. ExplodedRenderingHelperTest was not updated to the new API of ExplodedRenderingHelper" into eclair
Merge commit '
99d9b70cc91bc55fad415c7fdb891df90aa048d9'
* commit '
99d9b70cc91bc55fad415c7fdb891df90aa048d9':
Fix ADT Build. ExplodedRenderingHelperTest was not updated to the new API of ExplodedRenderingHelper
Raphael Moll [Thu, 28 Jan 2010 23:09:49 +0000 (15:09 -0800)]
am
176573bf: am
912fa771: Merge "Windows SDK: use find_java.bat in all batch wrappers." into eclair
Merge commit '
176573bfeb4c68d877a9de7f17a2ab33ddfb343f'
* commit '
176573bfeb4c68d877a9de7f17a2ab33ddfb343f':
Windows SDK: use find_java.bat in all batch wrappers.
Xavier Ducrohet [Thu, 28 Jan 2010 23:09:45 +0000 (15:09 -0800)]
am
cf68c35f: am
aae21fc0: Merge "ADT/GLE: Support more layouts in explode mode." into eclair
Merge commit '
cf68c35f51388b6764615a16a9585561b360b0b4'
* commit '
cf68c35f51388b6764615a16a9585561b360b0b4':
ADT/GLE: Support more layouts in explode mode.
Raphael [Thu, 28 Jan 2010 23:06:00 +0000 (15:06 -0800)]
am
af44fbeb: am
60e5014c: android.bat now checks if Java is installed.
Merge commit '
af44fbeb406ba3997614cabc70bf0d10d2693a50'
* commit '
af44fbeb406ba3997614cabc70bf0d10d2693a50':
android.bat now checks if Java is installed.
Xavier Ducrohet [Thu, 28 Jan 2010 22:56:55 +0000 (14:56 -0800)]
Xavier Ducrohet [Thu, 28 Jan 2010 21:19:09 +0000 (13:19 -0800)]
Display VM message on profiling error. Do not merge
Integrated from master to be in SDK Tools r5.
Bug:
2160407
Change-Id: Ib9cfcb68cc2c38947350b3419a96ce917db51b35
Xavier Ducrohet [Thu, 28 Jan 2010 18:44:02 +0000 (10:44 -0800)]
DDMS: Add support for profiling with VM able to send the result through JDWP. Do not merge.
Older VMs need to write the trace file on the SD Card which requires
the appropriate permission. This new mode directly streams the trace
file from the VM to DDMS.
Integrated from master to be in SDK Tools r5.
Bug:
2160407
Change-Id: I17d3e314d6325c1bdff041564bc939b2778b563e
Andy McFadden [Tue, 26 Jan 2010 15:37:22 +0000 (07:37 -0800)]
Strawman support for streaming method profiling. do not merge.
This will send MPSS/MPSE packets instead of MPRS/MPRE when the client VM
supports them. At least, it would if the property check weren't
hard-wired to false, which is done because the MPSE handling in DDMS is
incomplete (currently just dumps the first 100 chars so you can see that
it really got something).
Integrated from master to be in SDK Tools r5.
For bug
2160407.
Change-Id: I92b7d43fa78e3cb3eefdcef9e7357bbc6818822b
Xavier Ducrohet [Thu, 28 Jan 2010 22:40:26 +0000 (14:40 -0800)]
Merge "Display VM message on profiling error"
Xavier Ducrohet [Thu, 28 Jan 2010 22:40:23 +0000 (14:40 -0800)]
Merge "DDMS: Add support for profiling with VM able to send the result through JDWP."
Xavier Ducrohet [Thu, 28 Jan 2010 21:19:09 +0000 (13:19 -0800)]
Display VM message on profiling error
Bug:
2160407
Change-Id: Ifcce3f12b9de8e07bc035c8b74f82911d81c490e
Xavier Ducrohet [Thu, 28 Jan 2010 18:44:02 +0000 (10:44 -0800)]
DDMS: Add support for profiling with VM able to send the result through JDWP.
Older VMs need to write the trace file on the SD Card which requires
the appropriate permission. This new mode directly streams the trace
file from the VM to DDMS.
Bug:
2160407
Change-Id: Ic0e0813d8453761caecb990d85ca7e3baf1d237a
Xavier Ducrohet [Thu, 28 Jan 2010 21:44:23 +0000 (13:44 -0800)]
am
d595b92c: am
e83bdbb2: Update the change log for the eclipse plugin.
Merge commit '
d595b92c8fce547feb2d661c4d0cef58fe3ee8dd'
* commit '
d595b92c8fce547feb2d661c4d0cef58fe3ee8dd':
Update the change log for the eclipse plugin.
Xavier Ducrohet [Thu, 28 Jan 2010 21:44:12 +0000 (13:44 -0800)]
am
39a67ee5: am
55557dca: Merge "Updated to better distinguish between options and operands" into eclair
Merge commit '
39a67ee5dd18d8f744003c09b3292774a53dfb00'
* commit '
39a67ee5dd18d8f744003c09b3292774a53dfb00':
Updated to better distinguish between options and operands
Xavier Ducrohet [Thu, 28 Jan 2010 21:44:04 +0000 (13:44 -0800)]
am
d5c86740: am
56b4806f: Merge "resolves Issue #5280: Go to problem in source from Logcat." into eclair
Merge commit '
d5c8674015ef40b1356629d2e8dca3f9a8b18ee3'
* commit '
d5c8674015ef40b1356629d2e8dca3f9a8b18ee3':
resolves Issue #5280: Go to problem in source from Logcat.
Raphael [Thu, 28 Jan 2010 21:43:55 +0000 (13:43 -0800)]
am
7998adf8: am
141efab3: SDK Updater: Install samples in correct directory.
Merge commit '
7998adf84916b759a927d75b30480cb0dfe41f6c'
* commit '
7998adf84916b759a927d75b30480cb0dfe41f6c':
SDK Updater: Install samples in correct directory.
Raphael Moll [Thu, 28 Jan 2010 21:43:21 +0000 (13:43 -0800)]
am
a3d960d8: am
31d2e1f6: Merge "ADT NPW: cleanup minSdkVersion resolution for samples." into eclair
Merge commit '
a3d960d87da2da706552c5bf259453bc48c6853a'
* commit '
a3d960d87da2da706552c5bf259453bc48c6853a':
ADT NPW: cleanup minSdkVersion resolution for samples.
Raphael [Thu, 28 Jan 2010 20:37:37 +0000 (12:37 -0800)]
am
9cb06733: am
a713fb96: SDK Updater: support <obsolete> packages.
Merge commit '
9cb0673366c2cd57bc0bbd1381e4bf87ccd0f095'
* commit '
9cb0673366c2cd57bc0bbd1381e4bf87ccd0f095':
SDK Updater: support <obsolete> packages.
Xavier Ducrohet [Thu, 28 Jan 2010 20:36:55 +0000 (12:36 -0800)]
am
8061d489: am
14bf157d: Merge "Error when building application with package that has a single segment." into eclair
Merge commit '
8061d489e4ef5b6ca6cf14e14299ab5e9fea6e38'
* commit '
8061d489e4ef5b6ca6cf14e14299ab5e9fea6e38':
Error when building application with package that has a single segment.
Raphael Moll [Thu, 28 Jan 2010 20:36:33 +0000 (12:36 -0800)]
am
29e98002: Merge "SDK Launcher: capture stdout from batch file." into eclair
Merge commit '
29e980028f7fffbf8643ab7f6c083f721b5dba1f' into eclair-plus-aosp
* commit '
29e980028f7fffbf8643ab7f6c083f721b5dba1f':
SDK Launcher: capture stdout from batch file.
Raphael Moll [Thu, 28 Jan 2010 20:32:03 +0000 (12:32 -0800)]
Merge "SDK Launcher: capture stdout from batch file." into eclair
Raphael [Thu, 28 Jan 2010 18:47:52 +0000 (10:47 -0800)]
am
18c39a9a: am
f20987a9: SDK Updater: samples support.
Merge commit '
18c39a9abf9e273febe2b024f3fc4a6decc28b88'
* commit '
18c39a9abf9e273febe2b024f3fc4a6decc28b88':
SDK Updater: samples support.
Raphael Moll [Thu, 28 Jan 2010 18:09:31 +0000 (10:09 -0800)]
am
bd948aa0: am
1475004b: Merge "SDK Updater: support sample packages." into eclair
Merge commit '
bd948aa02374110a0cd3f65cb2c40d1ef0ffdeff'
* commit '
bd948aa02374110a0cd3f65cb2c40d1ef0ffdeff':
SDK Updater: support sample packages.
Xavier Ducrohet [Thu, 28 Jan 2010 16:18:01 +0000 (08:18 -0800)]
am
f884409e: am
2084837b: ADT: Fix case where the launch config contains a deleted activity.
Merge commit '
f884409e4f9a06f3455a7a7625fdedda06506458'
* commit '
f884409e4f9a06f3455a7a7625fdedda06506458':
ADT: Fix case where the launch config contains a deleted activity.
Raphael [Wed, 27 Jan 2010 20:48:34 +0000 (12:48 -0800)]
SDK Launcher: capture stdout from batch file.
Change-Id: Iab4e8f54bf2039cd9a17b1e814ffdc3ccd3deb23
Xavier Ducrohet [Thu, 28 Jan 2010 02:39:38 +0000 (18:39 -0800)]
am
786767f6: am
ae6a39ce: Merge "Add support for packaging gdbserver in the apk in Ant." into eclair
Merge commit '
786767f6fedc1f41e4dbc622cacf2427385eb1b9'
* commit '
786767f6fedc1f41e4dbc622cacf2427385eb1b9':
Add support for packaging gdbserver in the apk in Ant.
Xavier Ducrohet [Thu, 28 Jan 2010 02:39:28 +0000 (18:39 -0800)]
am
a7d03d38: am
1dd249c8: Merge "ADT: Add missing NSL comment." into eclair
Merge commit '
a7d03d383dfb410a4ea7e3eb3c2f7fd8c16d75cc'
* commit '
a7d03d383dfb410a4ea7e3eb3c2f7fd8c16d75cc':
ADT: Add missing NSL comment.
Raphael Moll [Thu, 28 Jan 2010 02:39:18 +0000 (18:39 -0800)]
am
442a3114: am
57042dd0: Merge "SDK Updater: refuse installing an addon without a matching platform." into eclair
Merge commit '
442a3114422f82f513f08c0302b5450a40cceade'
* commit '
442a3114422f82f513f08c0302b5450a40cceade':
SDK Updater: refuse installing an addon without a matching platform.
Xavier Ducrohet [Thu, 28 Jan 2010 01:27:10 +0000 (17:27 -0800)]
am
e2040280: am
fc6b8898: Merge "ADT: Make the builders add gdbserver with the native libs if needed." into eclair
Merge commit '
e2040280e5c87f2af29ff9f9910425fb800d9d02'
* commit '
e2040280e5c87f2af29ff9f9910425fb800d9d02':
ADT: Make the builders add gdbserver with the native libs if needed.
The Android Open Source Project [Thu, 28 Jan 2010 00:15:53 +0000 (16:15 -0800)]
Raphael Moll [Wed, 27 Jan 2010 23:52:53 +0000 (15:52 -0800)]
am
aaa48347: am
626101ea: Merge "SDK Updater: support min-api-level in Extra packages." into eclair
Merge commit '
aaa48347f16c35c749e9358656f2075bded79c5b'
* commit '
aaa48347f16c35c749e9358656f2075bded79c5b':
SDK Updater: support min-api-level in Extra packages.
Andy McFadden [Wed, 27 Jan 2010 23:21:17 +0000 (15:21 -0800)]
Merge "Strawman support for streaming method profiling."
Andy McFadden [Tue, 26 Jan 2010 15:37:22 +0000 (07:37 -0800)]
Strawman support for streaming method profiling.
This will send MPSS/MPSE packets instead of MPRS/MPRE when the client VM
supports them. At least, it would if the property check weren't
hard-wired to false, which is done because the MPSE handling in DDMS is
incomplete (currently just dumps the first 100 chars so you can see that
it really got something).
For bug
2160407.
Xavier Ducrohet [Wed, 27 Jan 2010 03:47:48 +0000 (19:47 -0800)]
Update version numbers for Tools-r6 / ADT 0.9.7
Change-Id: I2cd2e75f97369d2d8a69e7717a49a59784c1fffd
Raphael Moll [Wed, 27 Jan 2010 01:33:27 +0000 (17:33 -0800)]
am
f717e68d: Merge "SDK Updater: prevent potential NPE." into eclair
Merge commit '
f717e68d75b5cd48daba59e1868387f8913c5d2e' into eclair-plus-aosp
* commit '
f717e68d75b5cd48daba59e1868387f8913c5d2e':
SDK Updater: prevent potential NPE.
Raphael Moll [Wed, 27 Jan 2010 01:30:53 +0000 (17:30 -0800)]
Merge "SDK Updater: prevent potential NPE." into eclair
Xavier Ducrohet [Wed, 27 Jan 2010 01:22:53 +0000 (17:22 -0800)]
am
f7f9e459: Merge "Add support for the -0 aapt option in the custom Ant task for aapt." into eclair
Merge commit '
f7f9e459f1d695d79b04dc2d385c15ec9fdaf4f2' into eclair-plus-aosp
* commit '
f7f9e459f1d695d79b04dc2d385c15ec9fdaf4f2':
Add support for the -0 aapt option in the custom Ant task for aapt.
Xavier Ducrohet [Wed, 27 Jan 2010 01:19:48 +0000 (17:19 -0800)]
Merge "Add support for the -0 aapt option in the custom Ant task for aapt." into eclair