Commit Graph

996 Commits

Author SHA1 Message Date
Piotr Gurgul
aead155ef2 Clean up temporary files after generating coverage report
After generating coverage report instrumentation.dir and files coverage.ec
and coverage.em are being deleted. As Emma treats both files incrementally,
running 'ant coverage' in the project with these files already existing
may produce unexpected results.
2009-09-16 10:43:19 -07:00
Piotr Gurgul
519e10746d Replace -no-sign and -debug-sign with macrodef attribute
Instead of setting property indicating if package should be signed
with debug key in separate targets, this information is being passed
as a package-helper macrodef parameter.
2009-09-15 16:46:21 -07:00
Android (Google) Code Review
b57c64fa71 Merge change 25008 into eclair
* changes:
  Reorganize android_rules and android_test_rules
2009-09-15 18:58:34 -04:00
Android (Google) Code Review
28e5f75c74 Merge change 24918 into eclair
* changes:
  Put back support for hardware.ini at the top level of an add-on.
2009-09-15 18:50:59 -04:00
Piotr Gurgul
05bf40edec Reorganize android_rules and android_test_rules
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.
2009-09-15 14:55:32 -07:00
Android (Google) Code Review
973def409f Merge change 24944 into eclair
* changes:
  SDK Updater: fix wrong error when unable to get repository.xml
2009-09-14 20:13:32 -04:00
Android (Google) Code Review
e336525b21 Merge change 24650 into eclair
* changes:
  Add <jarfile> tag to ApkBuilder ant task
2009-09-14 18:48:55 -04:00
Raphael
8151879a7d SDK Updater: fix wrong error when unable to get repository.xml
BUG 2095530

Change-Id: I19622378b8da049f1c3416b8e0951ecc1f7475f0
2009-09-14 15:35:54 -07:00
Android (Google) Code Review
3c8abc50a0 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
2009-09-14 14:44:54 -07:00
Xavier Ducrohet
80c767f761 Put back support for hardware.ini at the top level of an add-on.
Change-Id: Ifb4e567e69f0f5e6ffde8f98c636336cf1289e42
2009-09-14 14:14:09 -07:00
Raphael
2196fd0317 android tool: support --target symbolic target names
BUG 2056746

Change-Id: I579e58f7c63cf404cd11af394f41ed7f998593ce
2009-09-10 16:06:32 -07:00
Android (Google) Code Review
5d0e8840cd Merge change 24500 into eclair
* changes:
  ADT GLE: support multiple selection and alternate selection.
2009-09-10 16:35:13 -04:00
Android (Google) Code Review
1d2a56bb21 Merge change 24455 into eclair
* changes:
  Support for hardware.ini per skin in add-ons.
2009-09-10 15:53:38 -04:00
Raphael
fc033f2836 ADT GLE: support multiple selection and alternate selection.
Change-Id: Ia7ce5fb2365898fdcae73eacbaf6d08b091d7586
2009-09-09 23:53:01 -07:00
Android (Google) Code Review
f4c4102ca9 Merge change 23594 into eclair
* changes:
  Add ant-based code coverage support to Android SDK
2009-09-09 22:00:52 -04:00
Piotr Gurgul
6edb5a108e Add ant-based code coverage support to Android SDK
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.
2009-09-09 18:32:03 -07:00
Xavier Ducrohet
e17ff22563 Support for hardware.ini per skin in add-ons.
Change-Id: Iab230f09504a7df34faa6a27c121a79ef1ffd603
2009-09-09 16:25:44 -07:00
Android (Google) Code Review
e8bb54b5b7 Merge change 23595 into eclair
* changes:
  fixing NPE that i see on my Mac when running idegen.sh
2009-09-09 18:42:18 -04:00
Xavier Ducrohet
171125f678 Add preferences to DDMS (plug-in/standalone) for adb time out.
Change-Id: Ia48221e33ee5ffae4f381aa29bd99a62b148108e
2009-09-08 14:44:02 -07:00
Xavier Ducrohet
2589180d6d First pass at making adb connection timeout configurable.
ddmlib has its own preference class, so the timeout will be read from there.

Change-Id: Id492372caceca0ee2c38bcfa7423bd40d20d5648
2009-09-08 13:45:23 -07:00
Xavier Ducrohet
2cc9724024 GLE: remove mcc/mnc, add clipping support.
Change-Id: I9fc2ee167436ba234c6f09b1635f45b34b461c2e
2009-09-08 11:27:56 -07:00
Raphael
9135db1149 ADT: Display selection and mouse hover in GLE canvas.
Change-Id: Icc2f8331a099905d6e1aaa52b36cc17a7190cc4b
2009-09-04 17:59:56 -07:00
Android (Google) Code Review
0eb96d6433 Merge change 24047 into eclair
* changes:
  ADT: fix an NPE that can happen when an XML file resource is being refreshed by Eclipse whilst the SDK is not finished loading.
2009-09-04 17:56:34 -07:00
Raphael
6e1ee87955 ADT: fix an NPE that can happen when an XML file resource is being
refreshed by Eclipse whilst the SDK is not finished loading.

Change-Id: I970255925d98f7b84a726fa37bf1fef3d25ab520
2009-09-04 17:14:37 -07:00
Android (Google) Code Review
0b8d690837 Merge change 24031 into eclair
* changes:
  Update revision of the tools source.properties file.
2009-09-04 16:36:27 -07:00
Xavier Ducrohet
76140555b0 Update revision of the tools source.properties file.
Change-Id: I02d257baf1e28ee02db262ba4772645002ea0020
2009-09-04 15:26:39 -07:00
Android (Google) Code Review
1c3a3c3a61 Merge change 23909 into eclair
* changes:
  Add ddms support for contacts.
2009-09-04 14:11:50 -07:00
Ken Shirriff
a0b2bacaa4 Add ddms support for contacts.
Support the new contacts authname and the aggregation event.
2009-09-03 17:58:28 -07:00
Xavier Ducrohet
3ce85131be 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
2009-09-03 16:01:27 -07:00
Android (Google) Code Review
2b6f5d17a3 Merge change 23740 into eclair
* changes:
  Add support for opening HPROF files in Eclipse.
2009-09-02 20:18:12 -07:00
Xavier Ducrohet
be6e83d5b8 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
2009-09-02 20:16:12 -07:00
Xavier Ducrohet
46093a9204 Make DDMS log way less verbose.
All the Log.i() calls were in fact debug logging, so I moved them
to Log.d()

Change-Id: I47b9cd8e85e630d61506c8c2df3baf245a706e03
2009-09-02 18:03:01 -07:00
Raphael
a7bb36d181 SDK Updter: change window title to match ADT
Also change the name displayed by the "android" wrapping scripts.

Change-Id: I663e1dcadfef7caf2e42138e39b1237f08091c77
2009-09-02 15:17:22 -07:00
Raphael
b1e9793d66 ADT GLE: change error display to a separate sash.
This allows GEP to display both the latest error and the latest
successful rendering. The error still needs an icon and the
canvas will need to be grayed or something.

Also the LayoutCanvas will directly use the ILayoutResult and we
won't need to custom EditData in UiElementNode so the correspond
method is @deprecated (but obviously still supported for GLE1.)

Change-Id: Ia3afed836755dbd84a4511eaed0782c85a383ac9
2009-09-02 12:39:24 -07:00
Android (Google) Code Review
34103a5962 Merge change 23640 into eclair
* changes:
  Remove unused git files.
2009-09-02 11:17:32 -07:00
Xavier Ducrohet
43713c575e Remove unused git files.
Change-Id: I1501ae5bc5d8608f149f9d404e198aa9398b665b
2009-09-02 11:14:04 -07:00
Android (Google) Code Review
5a0b7395be Merge change 23546 into eclair
* changes:
  Add "Dump HPROF file" to DDMS/DDMS plugin
2009-09-02 10:54:54 -07:00
Debajit Ghosh
5f2ff00773 fixing NPE that i see on my Mac when running idegen.sh 2009-09-01 22:20:31 -07:00
Xavier Ducrohet
d2d24351d3 Add "Dump HPROF file" to DDMS/DDMS plugin
This uses the (new in cupcake) VM command through JDWP.
Older VMs are detected through the (also new) 'FEAT' command that notifies
which features the VM supports.

The hprof file is right now saved in /sdcard. Due to donut+ apps not having
the SD Card permission by default, we may need to change this in the (near)
future.

Upon completion of the dump by the VM, DDMS will give the user a file selector
to choose a place to save the file on the host machine.

Future improvements: run (our own) hat, or hprof-conv and a standard hprof
tool (Eclipse MAT integration for instance). This should be configurable
by the user.

Change-Id: I33696b0263e3d0788ad5d90cedf3cd17393d2f9b
2009-09-01 16:29:18 -07:00
Android (Google) Code Review
56098693d2 Merge change 23515 into eclair
* changes:
  Update apkbuilder to support new property names
2009-09-01 15:52:35 -07:00
Piotr Gurgul
4280da6d70 Update apkbuilder to support new property names
out.debug.unaligned.package property name has not been updated in
ApkBuilderTask.java and that is why ApkBuilder misbehaved
BUG: 2090896
2009-09-01 15:39:23 -07:00
Android (Google) Code Review
6ef45eb862 Merge change 23388 into eclair
* changes:
  DDMS now queries the VM for its features.
2009-09-01 11:57:14 -07:00
Brett Chabot
60c6de766d ADT: change continuous test ant script to run both functional and unit tests. 2009-09-01 01:06:47 -07:00
Xavier Ducrohet
bc4a352b19 DDMS now queries the VM for its features.
This is a first step to support method profiling on/off and hprof dump from
DDMS.

Change-Id: Id95767b458a8405a31bcbe295bb969597f0e6e03
2009-08-31 18:06:49 -07:00
Raphael
3a5851d125 ADT: GraphicalEditorPart is the new GLE2.
This CL represents the base for the new "Graphical Editor Part".

First, GLE2 has been renamed in GraphicalEditorPart. That's the
final name, I swear I won't change it again (until next month that is.)

The editor part has 3 composites: the top ConfigConfiguration
(same as usual, reused as-is), a new PaletteComposite and a new
LayoutCanavas. This last one displays the rendering image and
will deal with interactivity.

The LayoutCanvas is actually stacked with a label which displays
the rendering error. After a rendering, either the error or the
canvas is visible, depending on the success of the operation.
That would make it easier to have a different mechanism, for example
the error could be next to the last known rendering, they don't
have to be mutually exclusive.

It is worth noting that GraphicalEditorPart is 95% similar to
the GLE1, reusing all the glue code that we had to handle
layout requestes, refresh requests, sdk/framework load listeners,
configuration and file input changes, etc.

Both PaletteComposite and LayoutCanvas are currently embryonic
at best, just to make sure the editor part is structured correctly.

Change-Id: I36c2ae4d85a68e68a349adc63a718f06375e12c5
2009-08-27 09:52:49 -07:00
Xavier Ducrohet
0614664583 Make ApkBuilder create filenames supported by older rules.
'ant install' must know the debug apk filename so newer naming scheme breaks
on older rule files (1.5 and earlier).
The fix is to check for the presence of the property naming the debug,
signed, unaligned package. If the property is present, then we use
the new naming scheme ({base}[-{config}]-debug-unaligned.apk), else we use
the old one ({base}-[-{config}]-debug.apk).

Also merge the install/reinstall targets, since 'adb install -r <file>'
works even if the apk was not yet installed.

Change-Id: Id0670610a6539a3f48c955756955f950039c3cd0
2009-08-26 14:58:56 -07:00
Xavier Ducrohet
2328b4f3f5 am 3a92963b: Merge change 22652 into donut
Merge commit '3a92963bf3865330e89b3e7a66b66dd9cfc8792b' into eclair

* commit '3a92963bf3865330e89b3e7a66b66dd9cfc8792b':
  Cleanup SDK packaging: remove alias build files.
2009-08-26 11:41:53 -07:00
Android (Google) Code Review
3a92963bf3 Merge change 22652 into donut
* changes:
  Cleanup SDK packaging: remove alias build files.
2009-08-26 11:26:06 -07:00
Xavier Ducrohet
b908430652 Cleanup SDK packaging: remove alias build files. 2009-08-26 11:23:20 -07:00
Xavier Ducrohet
aa1abe879a Make ApkBuilder create filenames supported by older rules.
'ant install' must know the debug apk filename so newer naming scheme breaks
on older rule files (1.5 and earlier).
The fix is to check for the presence of the property naming the debug,
signed, unaligned package. If the property is present, then we use
the new naming scheme ({base}[-{config}]-debug-unaligned.apk), else we use
the old one ({base}-[-{config}]-debug.apk).

Also merge the install/reinstall targets, since 'adb install -r <file>'
works even if the apk was not yet installed.

DO NOT MERGE
2009-08-26 11:17:04 -07:00