OSDN Git Service

android-x86/sdk.git
14 years agoam 4ae8aec6: am 0b9f1ace: SDK Updater: ask for confirmation before wiping modified...
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.

14 years agoam 0b9f1ace: SDK Updater: ask for confirmation before wiping modified samples.
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.

14 years agoSDK Updater: ask for confirmation before wiping modified samples.
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

14 years agoAdd support for VMs that can stream hprof data through JDWP.
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

14 years agoam db173b4b: am f89bdfe5: Fix https download for the standalone version of the SDK...
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

14 years agoam f89bdfe5: 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

14 years agoFix 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

14 years agoam 74d66e2d: am 5f225229: Merge "SDK Updater: Support post install script for updatin...
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.

14 years agoam 183565b0: am 8a81794e: ADT NPW: disable auto-selection of minSdkVersion vs target.
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.

14 years agoam 5f225229: Merge "SDK Updater: Support post install script for updating SDK Setup...
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.

14 years agoam 8a81794e: ADT NPW: disable auto-selection of minSdkVersion vs target.
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.

14 years agoMerge "SDK Updater: Support post install script for updating SDK Setup.exe." into...
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

14 years agoStrawman support for streaming hprof dumps.
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.

14 years agoADT NPW: disable auto-selection of minSdkVersion vs target.
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

14 years agoSDK Updater: Support post install script for updating SDK Setup.exe.
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

14 years agoam 77784b30: (-s ours) am 53283c2d: Display VM message on profiling error. Do not...
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

14 years agoam 43ed0cb5: (-s ours) am b752b6ca: DDMS: Add support for profiling with VM able...
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.

14 years agoam 41e44ee2: (-s ours) am 54fa045c: Strawman support for streaming method profiling...
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.

14 years agoam 2b7a00d4: am 29e98002: Merge "SDK Launcher: capture stdout from batch file." into...
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.

14 years agoam 53283c2d: Display VM message on profiling error. Do not merge
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

14 years agoam b752b6ca: DDMS: Add support for profiling with VM able to send the result through...
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.

14 years agoam 54fa045c: Strawman support for streaming method profiling. 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.

14 years agoam ad354bd4: am f717e68d: Merge "SDK Updater: prevent potential NPE." into eclair
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.

14 years agoam 637f8fd1: am f7f9e459: Merge "Add support for the -0 aapt option in the custom...
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.

14 years agoam 99d9b70c: am cb2261e8: Merge "Fix ADT Build. ExplodedRenderingHelperTest was not...
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

14 years agoam 176573bf: am 912fa771: Merge "Windows SDK: use find_java.bat in all batch wrappers...
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.

14 years agoam cf68c35f: am aae21fc0: Merge "ADT/GLE: Support more layouts in explode mode."...
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.

14 years agoam af44fbeb: am 60e5014c: android.bat now checks if Java is installed.
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.

14 years agoam 7edb2a83: am c688b4ed: Generic Tools change log.
Xavier Ducrohet [Thu, 28 Jan 2010 22:56:55 +0000 (14:56 -0800)]
am 7edb2a83: am c688b4ed: Generic Tools change log.

Merge commit '7edb2a8389c3f5b7081a2d89699d7d2afdc64e39'

* commit '7edb2a8389c3f5b7081a2d89699d7d2afdc64e39':
  Generic Tools change log.

14 years agoDisplay VM message on profiling error. Do not merge
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

14 years agoDDMS: Add support for profiling with VM able to send the result through JDWP. Do...
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

14 years agoStrawman support for streaming method profiling. do not merge.
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

14 years agoMerge "Display VM message on profiling error"
Xavier Ducrohet [Thu, 28 Jan 2010 22:40:26 +0000 (14:40 -0800)]
Merge "Display VM message on profiling error"

14 years agoMerge "DDMS: Add support for profiling with VM able to send the result through JDWP."
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."

14 years agoDisplay VM message on profiling error
Xavier Ducrohet [Thu, 28 Jan 2010 21:19:09 +0000 (13:19 -0800)]
Display VM message on profiling error

Bug: 2160407
Change-Id: Ifcce3f12b9de8e07bc035c8b74f82911d81c490e

14 years agoDDMS: Add support for profiling with VM able to send the result through JDWP.
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

14 years agoam d595b92c: am e83bdbb2: Update the change log for the eclipse plugin.
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.

14 years agoam 39a67ee5: am 55557dca: Merge "Updated to better distinguish between options and...
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

14 years agoam d5c86740: am 56b4806f: Merge "resolves Issue #5280: Go to problem in source from...
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.

14 years agoam 7998adf8: am 141efab3: SDK Updater: Install samples in correct directory.
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.

14 years agoam a3d960d8: am 31d2e1f6: Merge "ADT NPW: cleanup minSdkVersion resolution for sample...
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.

14 years agoam 9cb06733: am a713fb96: SDK Updater: support <obsolete> packages.
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.

14 years agoam 8061d489: am 14bf157d: Merge "Error when building application with package that...
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.

14 years agoam 29e98002: Merge "SDK Launcher: capture stdout from batch file." into eclair
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.

14 years agoMerge "SDK Launcher: capture stdout from batch file." into eclair
Raphael Moll [Thu, 28 Jan 2010 20:32:03 +0000 (12:32 -0800)]
Merge "SDK Launcher: capture stdout from batch file." into eclair

14 years agoam 18c39a9a: am f20987a9: SDK Updater: samples support.
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.

14 years agoam bd948aa0: am 1475004b: Merge "SDK Updater: support sample packages." into eclair
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.

14 years agoam f884409e: am 2084837b: ADT: Fix case where the launch config contains a deleted...
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.

14 years agoSDK Launcher: capture stdout from batch file.
Raphael [Wed, 27 Jan 2010 20:48:34 +0000 (12:48 -0800)]
SDK Launcher: capture stdout from batch file.

Change-Id: Iab4e8f54bf2039cd9a17b1e814ffdc3ccd3deb23

14 years agoam 786767f6: am ae6a39ce: Merge "Add support for packaging gdbserver in the apk in...
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.

14 years agoam a7d03d38: am 1dd249c8: Merge "ADT: Add missing NSL comment." into eclair
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.

14 years agoam 442a3114: am 57042dd0: Merge "SDK Updater: refuse installing an addon without...
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.

14 years agoam e2040280: am fc6b8898: Merge "ADT: Make the builders add gdbserver with the native...
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.

14 years agoam eb53eb85: merge from open-source master
The Android Open Source Project [Thu, 28 Jan 2010 00:15:53 +0000 (16:15 -0800)]
am eb53eb85: merge from open-source master

Merge commit 'eb53eb85d027506342f5396307ced964b5cfdcbb'

* commit 'eb53eb85d027506342f5396307ced964b5cfdcbb':
  empty initial commit

14 years agoam aaa48347: am 626101ea: Merge "SDK Updater: support min-api-level in Extra packages...
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.

14 years agoMerge "Strawman support for streaming method profiling."
Andy McFadden [Wed, 27 Jan 2010 23:21:17 +0000 (15:21 -0800)]
Merge "Strawman support for streaming method profiling."

14 years agoStrawman 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.

14 years agoUpdate version numbers for Tools-r6 / ADT 0.9.7
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

14 years agoam f717e68d: Merge "SDK Updater: prevent potential NPE." into eclair
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.

14 years agoMerge "SDK Updater: prevent potential NPE." into eclair
Raphael Moll [Wed, 27 Jan 2010 01:30:53 +0000 (17:30 -0800)]
Merge "SDK Updater: prevent potential NPE." into eclair

14 years agoam f7f9e459: Merge "Add support for the -0 aapt option in the custom Ant task for...
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.

14 years agoMerge "Add support for the -0 aapt option in the custom Ant task for aapt." into...
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

14 years agoSDK Updater: prevent potential NPE.
Raphael [Wed, 27 Jan 2010 01:10:02 +0000 (17:10 -0800)]
SDK Updater: prevent potential NPE.

Not that I know how that could happen in the first place
but it can't hurt.

SDK Bug: 2306650

Change-Id: I981f993c815f25e4f596afc029f3e44b5ed73927

14 years agoAdd support for the -0 aapt option in the custom Ant task for aapt.
Xavier Ducrohet [Tue, 26 Jan 2010 23:54:22 +0000 (15:54 -0800)]
Add support for the -0 aapt option in the custom Ant task for aapt.

Bug: 2398432
Change-Id: I2df2b8638ffaf2a5da87ff2bf17efcfb5efdff70

14 years agoam cb2261e8: Merge "Fix ADT Build. ExplodedRenderingHelperTest was not updated to...
Xavier Ducrohet [Wed, 27 Jan 2010 00:43:52 +0000 (16:43 -0800)]
am cb2261e8: Merge "Fix ADT Build. ExplodedRenderingHelperTest was not updated to the new API of ExplodedRenderingHelper" into eclair

Merge commit 'cb2261e8cac4d0b6f381eeaf454f72d4e065c22c' into eclair-plus-aosp

* commit 'cb2261e8cac4d0b6f381eeaf454f72d4e065c22c':
  Fix ADT Build. ExplodedRenderingHelperTest was not updated to the new API of ExplodedRenderingHelper

14 years agoMerge "Fix ADT Build. ExplodedRenderingHelperTest was not updated to the new API...
Xavier Ducrohet [Wed, 27 Jan 2010 00:39:40 +0000 (16:39 -0800)]
Merge "Fix ADT Build. ExplodedRenderingHelperTest was not updated to the new API of ExplodedRenderingHelper" into eclair

14 years agoFix ADT Build. ExplodedRenderingHelperTest was not updated to the new API of Exploded...
Xavier Ducrohet [Wed, 27 Jan 2010 00:38:37 +0000 (16:38 -0800)]
Fix ADT Build. ExplodedRenderingHelperTest was not updated to the new API of ExplodedRenderingHelper

Change-Id: I987004d3869f9e2f94efb0bec1f92f55a8c42501

14 years agoam 912fa771: Merge "Windows SDK: use find_java.bat in all batch wrappers." into eclair
Raphael Moll [Wed, 27 Jan 2010 00:25:42 +0000 (16:25 -0800)]
am 912fa771: Merge "Windows SDK: use find_java.bat in all batch wrappers." into eclair

Merge commit '912fa77151c7814b58c9b6ab46a2f682cd97fcd6' into eclair-plus-aosp

* commit '912fa77151c7814b58c9b6ab46a2f682cd97fcd6':
  Windows SDK: use find_java.bat in all batch wrappers.

14 years agoMerge "Windows SDK: use find_java.bat in all batch wrappers." into eclair
Raphael Moll [Wed, 27 Jan 2010 00:22:33 +0000 (16:22 -0800)]
Merge "Windows SDK: use find_java.bat in all batch wrappers." into eclair

14 years agoWindows SDK: use find_java.bat in all batch wrappers.
Raphael [Wed, 27 Jan 2010 00:08:17 +0000 (16:08 -0800)]
Windows SDK: use find_java.bat in all batch wrappers.

SDK Bug: 2315813

Change-Id: If026d09f927b3d0b5707dfd08e1367e4ba2da28b

14 years agoam aae21fc0: Merge "ADT/GLE: Support more layouts in explode mode." into eclair
Xavier Ducrohet [Wed, 27 Jan 2010 00:04:50 +0000 (16:04 -0800)]
am aae21fc0: Merge "ADT/GLE: Support more layouts in explode mode." into eclair

Merge commit 'aae21fc056ff15325c5ff5158648b7c6be7728de' into eclair-plus-aosp

* commit 'aae21fc056ff15325c5ff5158648b7c6be7728de':
  ADT/GLE: Support more layouts in explode mode.

14 years agoMerge "ADT/GLE: Support more layouts in explode mode." into eclair
Xavier Ducrohet [Wed, 27 Jan 2010 00:00:14 +0000 (16:00 -0800)]
Merge "ADT/GLE: Support more layouts in explode mode." into eclair

14 years agoam 60e5014c: android.bat now checks if Java is installed.
Raphael [Tue, 26 Jan 2010 22:31:01 +0000 (14:31 -0800)]
am 60e5014c: android.bat now checks if Java is installed.

Merge commit '60e5014c5f2783982e7afade657eaeb9a287577e' into eclair-plus-aosp

* commit '60e5014c5f2783982e7afade657eaeb9a287577e':
  android.bat now checks if Java is installed.

14 years agoandroid.bat now checks if Java is installed.
Raphael [Tue, 26 Jan 2010 21:47:04 +0000 (13:47 -0800)]
android.bat now checks if Java is installed.

When not in the path, search for it in the program files
where java installs by default.
If not found, let the user know where to download it.

SDK Bug: 2315813

Change-Id: I4b077606d86969f989279a5eaeebb2f1895a6ef2

14 years agoADT/GLE: Support more layouts in explode mode.
Xavier Ducrohet [Wed, 13 Jan 2010 00:34:23 +0000 (16:34 -0800)]
ADT/GLE: Support more layouts in explode mode.

Bug: 2391888
Change-Id: Id4076bed2d1c78896ccdd3872debdc84d9487aee

14 years agoam c688b4ed: Generic Tools change log.
Xavier Ducrohet [Tue, 26 Jan 2010 20:28:06 +0000 (12:28 -0800)]
am c688b4ed: Generic Tools change log.

Merge commit 'c688b4ed49331a3faab9f94fba7b8861c23301cd' into eclair-plus-aosp

* commit 'c688b4ed49331a3faab9f94fba7b8861c23301cd':
  Generic Tools change log.

14 years agoGeneric Tools change log.
Xavier Ducrohet [Tue, 26 Jan 2010 02:19:11 +0000 (18:19 -0800)]
Generic Tools change log.

Change-Id: I8354405e124dd955531a22b59ff026b91359c70c

14 years agoam 98f19555: am 32cfca58: Merge "ADT: fix potential NPE when launching app." into...
Xavier Ducrohet [Tue, 26 Jan 2010 07:35:06 +0000 (23:35 -0800)]
am 98f19555: am 32cfca58: Merge "ADT: fix potential NPE when launching app." into eclair

Merge commit '98f19555674296bec52f439b972497c4f6c4aad1'

* commit '98f19555674296bec52f439b972497c4f6c4aad1':
  ADT: fix potential NPE when launching app.

14 years agoam 5b2602a9: am fe14931d: Make "android update test-project" create all necessary...
Xavier Ducrohet [Tue, 26 Jan 2010 07:34:55 +0000 (23:34 -0800)]
am 5b2602a9: am fe14931d: Make "android update test-project" create all necessary files.

Merge commit '5b2602a9b501ad806683a5a7309622543813977d'

* commit '5b2602a9b501ad806683a5a7309622543813977d':
  Make "android update test-project" create all necessary files.

14 years agoam e83bdbb2: Update the change log for the eclipse plugin.
Xavier Ducrohet [Tue, 26 Jan 2010 00:56:59 +0000 (16:56 -0800)]
am e83bdbb2: Update the change log for the eclipse plugin.

Merge commit 'e83bdbb299b896fef8871e15314bbce0be71217a' into eclair-plus-aosp

* commit 'e83bdbb299b896fef8871e15314bbce0be71217a':
  Update the change log for the eclipse plugin.

14 years agoUpdate the change log for the eclipse plugin.
Xavier Ducrohet [Tue, 26 Jan 2010 00:36:29 +0000 (16:36 -0800)]
Update the change log for the eclipse plugin.

Change-Id: Ie3bda15b870c842fd57100d67da3620058893bb1

14 years agoam 55557dca: Merge "Updated to better distinguish between options and operands" into...
Xavier Ducrohet [Tue, 26 Jan 2010 00:21:49 +0000 (16:21 -0800)]
am 55557dca: Merge "Updated to better distinguish between options and operands" into eclair

Merge commit '55557dcabbe4960ce4c727e238ce30fa080f4345' into eclair-plus-aosp

* commit '55557dcabbe4960ce4c727e238ce30fa080f4345':
  Updated to better distinguish between options and operands

14 years agoMerge "Updated to better distinguish between options and operands" into eclair
Xavier Ducrohet [Tue, 26 Jan 2010 00:19:18 +0000 (16:19 -0800)]
Merge "Updated to better distinguish between options and operands" into eclair

14 years agoUpdated to better distinguish between options and operands
Nate Karstens [Tue, 26 Jan 2010 00:06:14 +0000 (16:06 -0800)]
Updated to better distinguish between options and operands

This is integrated from external/master/development.git in
order to not be lost when the development->sdk move is
merged into external/master

Change-Id: I51631f4efd75f8fb429499fb3ddd1926b7467038
http://android.git.kernel.org/?p=platform/development.git;a=commit;h=582fcd428db0a49e453c64c8233f9f82ae72e1fc

14 years agoam 56b4806f: Merge "resolves Issue #5280: Go to problem in source from Logcat." into...
Xavier Ducrohet [Tue, 26 Jan 2010 00:01:59 +0000 (16:01 -0800)]
am 56b4806f: Merge "resolves Issue #5280: Go to problem in source from Logcat." into eclair

Merge commit '56b4806f144a6cfe100b7ef0367359af524e97a2' into eclair-plus-aosp

* commit '56b4806f144a6cfe100b7ef0367359af524e97a2':
  resolves Issue #5280: Go to problem in source from Logcat.

14 years agoam 141efab3: SDK Updater: Install samples in correct directory.
Raphael [Tue, 26 Jan 2010 00:01:56 +0000 (16:01 -0800)]
am 141efab3: SDK Updater: Install samples in correct directory.

Merge commit '141efab32a8b8d491fa3781f55c2fddd62312a01' into eclair-plus-aosp

* commit '141efab32a8b8d491fa3781f55c2fddd62312a01':
  SDK Updater: Install samples in correct directory.

14 years agoMerge "resolves Issue #5280: Go to problem in source from Logcat." into eclair
Xavier Ducrohet [Mon, 25 Jan 2010 23:58:45 +0000 (15:58 -0800)]
Merge "resolves Issue #5280: Go to problem in source from Logcat." into eclair

14 years agoresolves Issue #5280: Go to problem in source from Logcat.
Karl Ostmo [Mon, 25 Jan 2010 23:47:25 +0000 (15:47 -0800)]
resolves Issue #5280: Go to problem in source from Logcat.

This is integrated from external/master/development.git in
order to not be lost when the development->sdk move is
merged into external/master

Change-Id: I36b6c467900c80b58342ee586f802979e8ce821c
http://android.git.kernel.org/?p=platform/development.git;a=commit;h=fa974da92bec6ea9bb03ac4511622d784f04d271

14 years agoSDK Updater: Install samples in correct directory.
Raphael [Mon, 25 Jan 2010 22:54:40 +0000 (14:54 -0800)]
SDK Updater: Install samples in correct directory.

Also makes sure root directories exist before trying to
install into them

SDK Bug: 2384690

Change-Id: I9ed9f1b206debfc051d7b627afd5fd1fac96dd88

14 years agoam 31d2e1f6: Merge "ADT NPW: cleanup minSdkVersion resolution for samples." into...
Raphael Moll [Mon, 25 Jan 2010 19:23:17 +0000 (11:23 -0800)]
am 31d2e1f6: Merge "ADT NPW: cleanup minSdkVersion resolution for samples." into eclair

Merge commit '31d2e1f6ee7d8a033c3d73b62d51fb220ff36d56' into eclair-plus-aosp

* commit '31d2e1f6ee7d8a033c3d73b62d51fb220ff36d56':
  ADT NPW: cleanup minSdkVersion resolution for samples.

14 years agoMerge "ADT NPW: cleanup minSdkVersion resolution for samples." into eclair
Raphael Moll [Mon, 25 Jan 2010 19:20:38 +0000 (11:20 -0800)]
Merge "ADT NPW: cleanup minSdkVersion resolution for samples." into eclair

14 years agoam 2e08725e: am 9f11429c: Fix issue with absolute path in -nf parameter of apkbuilder.
Xavier Ducrohet [Mon, 25 Jan 2010 16:58:39 +0000 (08:58 -0800)]
am 2e08725e: am 9f11429c: Fix issue with absolute path in -nf parameter of apkbuilder.

Merge commit '2e08725e882577dfb5a8905438958a47940ba3e9'

* commit '2e08725e882577dfb5a8905438958a47940ba3e9':
  Fix issue with absolute path in -nf parameter of apkbuilder.

14 years agoam a713fb96: SDK Updater: support <obsolete> packages.
Raphael [Sat, 23 Jan 2010 03:09:01 +0000 (19:09 -0800)]
am a713fb96: SDK Updater: support <obsolete> packages.

Merge commit 'a713fb965670b8bdb2f05914af89f1ad41fae7b5' into eclair-plus-aosp

* commit 'a713fb965670b8bdb2f05914af89f1ad41fae7b5':
  SDK Updater: support <obsolete> packages.

14 years agoADT NPW: cleanup minSdkVersion resolution for samples.
Raphael [Sat, 23 Jan 2010 02:56:10 +0000 (18:56 -0800)]
ADT NPW: cleanup minSdkVersion resolution for samples.

This fixes a couple quirks in NPW:
- When you select a sample, its minSdkVersion is now used as-is
  but the currently selected target is not changed to match.
  Otherwise it invalidates the list of samples you're trying to
  import from...
- This allows for samples with no minSdkVersion to properly
  import with an empty field.
- Same issue if you were to manually edit the field after the fact.

Also renamed IAndroidTarget.isCompatibleBaseFor() to
IAndroidTarget.canRunOn(), which is way more readable.

This also "fixes" bug 2346838 -- kind of, the bug was obsolete
since I had added the new sample mode but there was another
quirk instead (it was reverting the target so it invalidated
the sample you were trying to import... see point #1 above.)

Change-Id: If2487632484fa5646bea7fe2625a2a55e5d26c50

14 years agoSDK Updater: support <obsolete> packages.
Raphael [Sat, 23 Jan 2010 00:28:23 +0000 (16:28 -0800)]
SDK Updater: support <obsolete> packages.

Bug: 2390937
Change-Id: Ie571d308475a32bc81510785152b230031037094

14 years agoam 14bf157d: Merge "Error when building application with package that has a single...
Xavier Ducrohet [Fri, 22 Jan 2010 23:56:44 +0000 (15:56 -0800)]
am 14bf157d: Merge "Error when building application with package that has a single segment." into eclair

Merge commit '14bf157d4c45ed254730ad8e26a0b1bad5604c34' into eclair-plus-aosp

* commit '14bf157d4c45ed254730ad8e26a0b1bad5604c34':
  Error when building application with package that has a single segment.

14 years agoMerge "Error when building application with package that has a single segment." into...
Xavier Ducrohet [Fri, 22 Jan 2010 23:52:45 +0000 (15:52 -0800)]
Merge "Error when building application with package that has a single segment." into eclair

14 years agoError when building application with package that has a single segment.
Xavier Ducrohet [Fri, 22 Jan 2010 23:38:21 +0000 (15:38 -0800)]
Error when building application with package that has a single segment.

Bug: 2261147
Change-Id: I92660ca99eaa7e9d180402683e5c9be0f3dc28d4

14 years agoam f20987a9: SDK Updater: samples support.
Raphael [Fri, 22 Jan 2010 22:28:00 +0000 (14:28 -0800)]
am f20987a9: SDK Updater: samples support.

Merge commit 'f20987a9129ddd5f8911a0371b2f30f939a1ce39' into eclair-plus-aosp

* commit 'f20987a9129ddd5f8911a0371b2f30f939a1ce39':
  SDK Updater: samples support.

14 years agoSDK Updater: samples support.
Raphael [Fri, 22 Jan 2010 21:04:52 +0000 (13:04 -0800)]
SDK Updater: samples support.

- Scan unknown /samples folders.
- Sample icon for package list.
- Renamed all package icons to <name>_pkg_16.png to simplify loader.

Bug: 2384690

Change-Id: I4deb11c37918e75357b3bb5212f0007126a8f3de