OSDN Git Service
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 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 [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.
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
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 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.
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.
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
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.
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
Xavier Ducrohet [Fri, 22 Jan 2010 17:44:51 +0000 (09:44 -0800)]
am
045c5017: am
d1e2dff8: ADT: Fix arrayoutofboundexception
Merge commit '
045c5017621346766439d58ed51488cec72b61aa'
* commit '
045c5017621346766439d58ed51488cec72b61aa':
ADT: Fix arrayoutofboundexception
Ken Shirriff [Fri, 22 Jan 2010 07:10:47 +0000 (23:10 -0800)]
Add com.android.calendar to sync authorities.
bug
2388178
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 22:29:38 +0000 (14:29 -0800)]
am
cb30ba7b: am
a72ddb57: ADT GRE: create base class for IViewRule.
Merge commit '
cb30ba7b09747ac3c948266db4ea2eb19fd6e962'
* commit '
cb30ba7b09747ac3c948266db4ea2eb19fd6e962':
ADT GRE: create base class for IViewRule.
Raphael [Thu, 21 Jan 2010 22:28:29 +0000 (14:28 -0800)]
am
28ad8a42: am
1a9d3049: ADT GRE: Move gscripts package.
Merge commit '
28ad8a4261c24ba52f95e54a61cb1b47fcd08ef9'
* commit '
28ad8a4261c24ba52f95e54a61cb1b47fcd08ef9':
ADT GRE: Move gscripts package.
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
Xavier Ducrohet [Thu, 21 Jan 2010 19:35:34 +0000 (11:35 -0800)]
ADT: Make the builders add gdbserver with the native libs if needed.
Change-Id: I0324919b4c1cc0ce0b597b46dac5e875f8322a1e
The Android Open Source Project [Thu, 21 Jan 2010 19:21:34 +0000 (11:21 -0800)]
merge from open-source master
Raphael Moll [Thu, 21 Jan 2010 18:51:42 +0000 (10:51 -0800)]
am
626101ea: Merge "SDK Updater: support min-api-level in Extra packages." into eclair
Merge commit '
626101eadcf09ed6f471c923e1cf8deba1cd6b56' into eclair-plus-aosp
* commit '
626101eadcf09ed6f471c923e1cf8deba1cd6b56':
SDK Updater: support min-api-level in Extra packages.
Raphael Moll [Thu, 21 Jan 2010 18:36:44 +0000 (10:36 -0800)]
Merge "SDK Updater: support min-api-level in Extra packages." into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 18:02:42 +0000 (10:02 -0800)]
am
32cfca58: Merge "ADT: fix potential NPE when launching app." into eclair
Merge commit '
32cfca5838558c0beb9b771e3b2e880047eb8053' into eclair-plus-aosp
* commit '
32cfca5838558c0beb9b771e3b2e880047eb8053':
ADT: fix potential NPE when launching app.
Xavier Ducrohet [Thu, 21 Jan 2010 18:02:37 +0000 (10:02 -0800)]
am
fe14931d: Make "android update test-project" create all necessary files.
Merge commit '
fe14931d3c5c50a57d7cb705dfc57f919972fce6' into eclair-plus-aosp
* commit '
fe14931d3c5c50a57d7cb705dfc57f919972fce6':
Make "android update test-project" create all necessary files.
Xavier Ducrohet [Thu, 21 Jan 2010 17:50:51 +0000 (09:50 -0800)]
Merge "ADT: fix potential NPE when launching app." into eclair
Raphael [Thu, 21 Jan 2010 01:40:56 +0000 (17:40 -0800)]
SDK Updater: support min-api-level in Extra packages.
BUG:
2386406
Change-Id: I274079d228e9fe7ca2623b54adeae33d365662ed