Merge commit '28e5f75c74227db192476a7cec5bcb39a6bf2d54' into eclair-plus-aosp
* commit '28e5f75c74227db192476a7cec5bcb39a6bf2d54':
Put back support for hardware.ini at the top level of an add-on.
Instrumentation-related targets have been moved from android_test_rules to
android_rules for better consistency. Chain of target dependencies has
been modified in order to make it more natural.
Merge commit '973def409f419f673a7a3a34ecf6fcc07531338f' into eclair-plus-aosp
* commit '973def409f419f673a7a3a34ecf6fcc07531338f':
SDK Updater: fix wrong error when unable to get repository.xml
Merge commit 'e336525b2182b41548533898071417e7dc6c1c35' into eclair-plus-aosp
* commit 'e336525b2182b41548533898071417e7dc6c1c35':
Add <jarfile> tag to ApkBuilder ant task
ApkBuilder ant task accepts now the new tag - <jarfile>, used for passing
emma_device.jar to ApkBuilder.
Change-Id: I1757d265609406bc06da370ab0204018a4c8fc4d
Merge commit '1d2a56bb21b7800938077aa723ca9f04ec3bc614' into eclair-plus-aosp
* commit '1d2a56bb21b7800938077aa723ca9f04ec3bc614':
Support for hardware.ini per skin in add-ons.
Target 'run-tests' launches all the unit tests against the tested project.
Target 'coverage' emma-instruments the tested project's classes,
runs the tests against instrumented classes, collects code coverage data
and extracts it to human-readable form as report.html.
android_test_rules.xml contain additional rules for test projects.
Test projects are auto-recognized by presence of the tested.project.dir
property, which will be auto-generated for tests projects. Temporarily,
please add this property manually to the build.properties file.
Current version is mainly tested with default, android generated test projects.
This version includes also fixing relative to absolute paths for
properties which are most likely to be changed by user in external
property file.
Merge commit 'e8bb54b5b79816b43d9d1652d3dac9dc7b3d7e2d' into eclair-plus-aosp
* commit 'e8bb54b5b79816b43d9d1652d3dac9dc7b3d7e2d':
fixing NPE that i see on my Mac when running idegen.sh
Merge commit '171125f67834d992db9a45eb35775d2b87b9b189' into eclair-plus-aosp
* commit '171125f67834d992db9a45eb35775d2b87b9b189':
Add preferences to DDMS (plug-in/standalone) for adb time out.
Merge commit '2589180d6d095659c1f16f8747186aec58b14ea8' into eclair-plus-aosp
* commit '2589180d6d095659c1f16f8747186aec58b14ea8':
First pass at making adb connection timeout configurable.
Merge commit '0eb96d6433325b54678272b485bd2b88df3b74cb' into eclair-plus-aosp
* commit '0eb96d6433325b54678272b485bd2b88df3b74cb':
ADT: fix an NPE that can happen when an XML file resource is being
Merge commit '0b8d690837afaac4077150c85c854fdefb076885' into eclair-plus-aosp
* commit '0b8d690837afaac4077150c85c854fdefb076885':
Update revision of the tools source.properties file.
Merge commit '1c3a3c3a6173d3a647e5145730635a7d553c38d4' into eclair-plus-aosp
* commit '1c3a3c3a6173d3a647e5145730635a7d553c38d4':
Add ddms support for contacts.
Merge commit '3ce85131be916ea334012276d136a28cf111d123' into eclair-plus-aosp
* commit '3ce85131be916ea334012276d136a28cf111d123':
Add method profiling support to DDMS.
New button allows to start/stop tracing. When clicking stop, DDMS downloads
the trace file and starts Traceview.
Also refactored some common parts of the HPROF and tracing handlers into a
common class. The goal is to have a default, extensible implementation
of the HPROF handler that DDMS and the plug-in can reuse. This will reduce
duplicated code.
Change-Id: Ifc48926c7f6f1c3ea49a4aa94053664be83cbb06
Merge commit '2b6f5d17a3c3eff47cb804b1a6210cfd8a640a3d' into eclair-plus-aosp
* commit '2b6f5d17a3c3eff47cb804b1a6210cfd8a640a3d':
Add support for opening HPROF files in Eclipse.
The action taken on successful HPROF dump can now be configured from
the plug-in preference to be either "save to disk" or "open in eclipse".
If a plug-in supporting .hprof files (such as Eclipse Memory Analyzer Tool)
is present then the file will just be opened in the tool.
"save to disk" does not convert the file, "open in eclipse" does convert
the hprof file (using hprof-conv present in the SDK)
Change-Id: Iceb347abb2af5a2979b6028c22dcbdc3bc7250ca
Merge commit '46093a9204309a241b4e83dca4b7fbcba8768959' into eclair-plus-aosp
* commit '46093a9204309a241b4e83dca4b7fbcba8768959':
Make DDMS log way less verbose.
Merge commit 'a7bb36d181639ffc1bafa9e4080ca4f5691043ba' into eclair-plus-aosp
* commit 'a7bb36d181639ffc1bafa9e4080ca4f5691043ba':
SDK Updter: change window title to match ADT
