OSDN Git Service
The Android Open Source Project [Fri, 5 Feb 2010 16:48:08 +0000 (08:48 -0800)]
am
b7deec25: reconcile main tree with open-source eclair
Merge commit '
b7deec2514dfa9b0c8a67df340023f16c8ef0f7a' into eclair-plus-aosp
* commit '
b7deec2514dfa9b0c8a67df340023f16c8ef0f7a':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:42 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
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 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 [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 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 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: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
The Android Open Source Project [Fri, 29 Jan 2010 22:09:57 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
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: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.
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
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 [Wed, 27 Jan 2010 20:48:34 +0000 (12:48 -0800)]
SDK Launcher: capture stdout from batch file.
Change-Id: Iab4e8f54bf2039cd9a17b1e814ffdc3ccd3deb23
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
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
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
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
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
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
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.
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
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
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.
Xavier Ducrohet [Wed, 27 Jan 2010 00:00:14 +0000 (16:00 -0800)]
Merge "ADT/GLE: Support more layouts in explode mode." into eclair
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.
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
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
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.
Xavier Ducrohet [Tue, 26 Jan 2010 02:19:11 +0000 (18:19 -0800)]
Generic Tools change log.
Change-Id: I8354405e124dd955531a22b59ff026b91359c70c
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.
Xavier Ducrohet [Tue, 26 Jan 2010 00:36:29 +0000 (16:36 -0800)]
Update the change log for the eclipse plugin.
Change-Id: Ie3bda15b870c842fd57100d67da3620058893bb1
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
Xavier Ducrohet [Tue, 26 Jan 2010 00:19:18 +0000 (16:19 -0800)]
Merge "Updated to better distinguish between options and operands" into eclair
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
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.
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.
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
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
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
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.
Raphael Moll [Mon, 25 Jan 2010 19:20:38 +0000 (11:20 -0800)]
Merge "ADT NPW: cleanup minSdkVersion resolution for samples." into eclair
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.
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
Raphael [Sat, 23 Jan 2010 00:28:23 +0000 (16:28 -0800)]
SDK Updater: support <obsolete> packages.
Bug:
2390937
Change-Id: Ie571d308475a32bc81510785152b230031037094
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.
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
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
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.
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
Raphael Moll [Fri, 22 Jan 2010 20:00:43 +0000 (12:00 -0800)]
am
1475004b: Merge "SDK Updater: support sample packages." into eclair
Merge commit '
1475004b3f96c7ad97b017418a99378ff89f4598' into eclair-plus-aosp
* commit '
1475004b3f96c7ad97b017418a99378ff89f4598':
SDK Updater: support sample packages.
Raphael Moll [Fri, 22 Jan 2010 19:56:25 +0000 (11:56 -0800)]
Merge "SDK Updater: support sample packages." into eclair
Raphael [Fri, 22 Jan 2010 00:45:11 +0000 (16:45 -0800)]
SDK Updater: support sample packages.
TODO: needs an icon and scanning /samples folders not matching
any current platform (in next CL)
BUG:
2384690
Change-Id: I07d55a8e1ff897bde10c475050d0e18ae3ca7da8
Xavier Ducrohet [Fri, 22 Jan 2010 04:07:08 +0000 (20:07 -0800)]
am
2084837b: ADT: Fix case where the launch config contains a deleted activity.
Merge commit '
2084837bba5a7534b90697263d82a197854cf226' into eclair-plus-aosp
* commit '
2084837bba5a7534b90697263d82a197854cf226':
ADT: Fix case where the launch config contains a deleted activity.
Xavier Ducrohet [Fri, 22 Jan 2010 00:50:22 +0000 (16:50 -0800)]
ADT: Fix case where the launch config contains a deleted activity.
Bug:
2368879
Change-Id: I76719f625d792b20d362198ce060e5a33945d0d4
Xavier Ducrohet [Thu, 21 Jan 2010 23:50:38 +0000 (15:50 -0800)]
am
ae6a39ce: Merge "Add support for packaging gdbserver in the apk in Ant." into eclair
Merge commit '
ae6a39ce1586268b2ac5a00afa868d3f187dd0ef' into eclair-plus-aosp
* commit '
ae6a39ce1586268b2ac5a00afa868d3f187dd0ef':
Add support for packaging gdbserver in the apk in Ant.
Xavier Ducrohet [Thu, 21 Jan 2010 23:50:34 +0000 (15:50 -0800)]
am
1dd249c8: Merge "ADT: Add missing NSL comment." into eclair
Merge commit '
1dd249c856f458fbc83dab4a663aa57690b5c35a' into eclair-plus-aosp
* commit '
1dd249c856f458fbc83dab4a663aa57690b5c35a':
ADT: Add missing NSL comment.
Xavier Ducrohet [Thu, 21 Jan 2010 23:45:43 +0000 (15:45 -0800)]
Merge "Add support for packaging gdbserver in the apk in Ant." into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 23:45:37 +0000 (15:45 -0800)]
Merge "ADT: Add missing NSL comment." into eclair
Raphael Moll [Thu, 21 Jan 2010 23:34:53 +0000 (15:34 -0800)]
am
57042dd0: Merge "SDK Updater: refuse installing an addon without a matching platform." into eclair
Merge commit '
57042dd0e97a21a4df052e6f54783b9674562dfc' into eclair-plus-aosp
* commit '
57042dd0e97a21a4df052e6f54783b9674562dfc':
SDK Updater: refuse installing an addon without a matching platform.
Raphael Moll [Thu, 21 Jan 2010 23:32:08 +0000 (15:32 -0800)]
Merge "SDK Updater: refuse installing an addon without a matching platform." into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 23:27:49 +0000 (15:27 -0800)]
ADT: Add missing NSL comment.
Change-Id: Ib660a0c039f359b5c3fd2a39680e6c343e496dcd
Xavier Ducrohet [Thu, 21 Jan 2010 20:30:36 +0000 (12:30 -0800)]
Add support for packaging gdbserver in the apk in Ant.
This must only be done in debug so there's a new flag
to detect debug mode. Support for this is added to the
build script, the Ant task and ApkBuilder itself.
Change-Id: Iaebdc60cc3e8fa08c8cb75c885a6a0db556bfd86
Xavier Ducrohet [Thu, 21 Jan 2010 23:09:37 +0000 (15:09 -0800)]
am
fc6b8898: Merge "ADT: Make the builders add gdbserver with the native libs if needed." into eclair
Merge commit '
fc6b889892240f473c581edc9ad8d6670faba4a4' into eclair-plus-aosp
* commit '
fc6b889892240f473c581edc9ad8d6670faba4a4':
ADT: Make the builders add gdbserver with the native libs if needed.
Xavier Ducrohet [Thu, 21 Jan 2010 22:58:33 +0000 (14:58 -0800)]
Merge "ADT: Make the builders add gdbserver with the native libs if needed." into eclair
Raphael [Thu, 21 Jan 2010 21:36:45 +0000 (13:36 -0800)]
SDK Updater: refuse installing an addon without a matching platform.
This adds support for already installed archives as well as missing
platform archives when computing dependencies.
Change-Id: I40c7838d650af0d2e2aaee6bb1e0f2b4b84760c9