Commit Graph

1162 Commits

Author SHA1 Message Date
Piotr Gurgul
dccc44df44 am 07fc39ed: Merge change 26440 into eclair
Merge commit '07fc39edda5e53bb3ddd980a05ab2c6573685feb' into eclair-plus-aosp

* commit '07fc39edda5e53bb3ddd980a05ab2c6573685feb':
  Add auto-generated tested.project.dir property
2009-09-22 14:28:51 -07:00
Android (Google) Code Review
07fc39edda Merge change 26440 into eclair
* changes:
  Add auto-generated tested.project.dir property
2009-09-22 17:21:05 -04:00
Xavier Ducrohet
14fff84f14 Add support for Keyboard state "Soft"
Change-Id: Ief65b3988973fb3b3d9edbbb99df9354ffe85663
2009-09-22 14:16:26 -07:00
Piotr Gurgul
28265ed42f Add auto-generated tested.project.dir property
Adds tested.project.dir=".." to ProjectDir/tests/build.properties in order
to indicate automatically that this is a test project and point the
tested project directory.
2009-09-22 13:58:28 -07:00
Piotr Gurgul
b824d51914 am 36ee5daf: Merge change 26329 into eclair
Merge commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f' into eclair-plus-aosp

* commit '36ee5dafd0e106e40f6f1d3e3dffd60315ea659f':
  Distinguish jar folders and jar files in ApkBuilder script
2009-09-22 11:52:04 -07:00
Android (Google) Code Review
36ee5dafd0 Merge change 26329 into eclair
* changes:
  Distinguish jar folders and jar files in ApkBuilder script
2009-09-22 14:44:28 -04:00
Piotr Gurgul
666d24cc3c Distinguish jar folders and jar files in ApkBuilder script
Checking if -rj parameter value is a directory or a file
and calling the appropriate function for each of them.
2009-09-22 11:28:43 -07:00
Piotr Gurgul
d176d42d67 am 3cbe2b79: Add automatic application package extraction from manifest
Merge commit '3cbe2b7943c0437ffb8c2a03a679c0ca8b9f527e' into eclair-plus-aosp

* commit '3cbe2b7943c0437ffb8c2a03a679c0ca8b9f527e':
  Add automatic application package extraction from manifest
2009-09-22 11:21:16 -07:00
Piotr Gurgul
3cbe2b7943 Add automatic application package extraction from manifest
Automatic extraction of the application.package property has been added
leveradging xpath ant task. This reduces redundancy, removes hardcoded
application.package and solves bug with uninstalling test application
package. In order to function properly needs removing application.package
from build.properties file.
2009-09-21 21:44:00 -07:00
Xavier Ducrohet
61c8308205 am 27e73ec5: Merge change 26291 into eclair
Merge commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c' into eclair-plus-aosp

* commit '27e73ec55b1eea4186482ff54aa087eaa4d9263c':
  Update the SDK/AVD manager toolbar icon tooltip to be consistent.
2009-09-21 17:49:04 -07:00
Android (Google) Code Review
27e73ec55b Merge change 26291 into eclair
* changes:
  Update the SDK/AVD manager toolbar icon tooltip to be consistent.
2009-09-21 20:42:14 -04:00
Piotr Gurgul
2b7ecb4a49 am 6440b667: Merge change 26292 into eclair
Merge commit '6440b667b07f085faf5916a1c7836597ac0f6b63' into eclair-plus-aosp

* commit '6440b667b07f085faf5916a1c7836597ac0f6b63':
  Increase reusability of zipalign macrodef
2009-09-21 17:39:41 -07:00
Android (Google) Code Review
6440b667b0 Merge change 26292 into eclair
* changes:
  Increase reusability of zipalign macrodef
2009-09-21 20:31:08 -04:00
Xavier Ducrohet
d4d74b2b41 am 303d6948: Merge change 26277 into eclair
Merge commit '303d694863f055f09ed9b4a1b2eebeb809a2ddad' into eclair-plus-aosp

* commit '303d694863f055f09ed9b4a1b2eebeb809a2ddad':
  Add an XPath Ant task to be used in the android_rules.xml file.
2009-09-21 17:29:44 -07:00
Piotr Gurgul
9a73cd9add Increase reusability of zipalign macrodef
debug-helper macro has been renamed to zipalign-helper to reflect better its
function. Two parameters for input and output packages have been introduced.
Macro has been additionally leveradged in 'release' target where zipalign
was previously called directly, duplicating the code.
2009-09-21 17:22:34 -07:00
Android (Google) Code Review
303d694863 Merge change 26277 into eclair
* changes:
  Add an XPath Ant task to be used in the android_rules.xml file.
2009-09-21 20:22:27 -04:00
Xavier Ducrohet
54bc097702 Update the SDK/AVD manager toolbar icon tooltip to be consistent.
Change-Id: Ie4c98537035e11543dd22b870880d52506ca1b99
2009-09-21 17:20:48 -07:00
Piotr Gurgul
7d268ab9b8 am fddd720c: Add global verbosity control for SDK ant targets
Merge commit 'fddd720cf2530606b86f9a18f6e397dd9988958d' into eclair-plus-aosp

* commit 'fddd720cf2530606b86f9a18f6e397dd9988958d':
  Add global verbosity control for SDK ant targets
2009-09-21 16:55:22 -07:00
Piotr Gurgul
fddd720cf2 Add global verbosity control for SDK ant targets
The user-configurable property 'verbose' has been introduced. It is set by
default to 'false' and switching in on enables verbose mode for all the
intermediate steps for a given target.
2009-09-21 16:33:30 -07:00
Xavier Ducrohet
f8caa29838 Add an XPath Ant task to be used in the android_rules.xml file.
This task is designed to run XPath expression targetting Android XML files.
It will handle the Android namespace with the 'android' prefix, and store
the result of the XPath into a property.

Change-Id: I9094f5661d5e1ef86553ee1c54bdeca62366e0cd
classname: XPathTask
classpath: anttasks.jar, sdklib.jar

Usage:
<xpathtask input="path/of/file/to/read" output="name.of.property.to.write"
    expression="/xpath/expression/to/evaluate" />
2009-09-21 16:10:37 -07:00
Piotr Gurgul
6c324cbb23 am fbc5cc74: Merge change 25692 into eclair
Merge commit 'fbc5cc7488204b9b74acc587efa3c5d76a52c58b' into eclair-plus-aosp

* commit 'fbc5cc7488204b9b74acc587efa3c5d76a52c58b':
  Fix a bug in processing jarfolders in ApkBuilder
2009-09-17 20:08:43 -07:00
Android (Google) Code Review
fbc5cc7488 Merge change 25692 into eclair
* changes:
  Fix a bug in processing jarfolders in ApkBuilder
2009-09-17 23:01:49 -04:00
Piotr Gurgul
46ec8be0cb Fix a bug in processing jarfolders in ApkBuilder
Wrong parameter has been passed to the function which resulted
in exception.
http://b/issue?id=2127927
2009-09-17 19:42:01 -07:00
Piotr Gurgul
672637fc74 am 13130ae0: Merge change 25340 into eclair
Merge commit '13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3' into eclair-plus-aosp

* commit '13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3':
  Specify emma dump file location on the device explicitly
2009-09-17 12:31:02 -07:00
Android (Google) Code Review
13130ae08d Merge change 25340 into eclair
* changes:
  Specify emma dump file location on the device explicitly
2009-09-17 15:23:23 -04:00
Xavier Ducrohet
d79bf05747 am 8399a2bf: Merge change 25229 into eclair
Merge commit '8399a2bf6d415dc20788167b70b98e24b285466d' into eclair-plus-aosp

* commit '8399a2bf6d415dc20788167b70b98e24b285466d':
  Add support for new framebuffer protocol over adb.
2009-09-17 08:43:26 -07:00
Android (Google) Code Review
8399a2bf6d Merge change 25229 into eclair
* changes:
  Add support for new framebuffer protocol over adb.
2009-09-16 20:11:48 -04:00
Piotr Gurgul
089585b7c6 Specify emma dump file location on the device explicitly
This is to avoid using default location for the emma dump file (coverage.ec)
which is generated on the device. Pointing out the custom location (which
for now is the same as the default one) is more straightforward and
will be important if the default location changes in the future.
2009-09-16 16:32:57 -07:00
Xavier Ducrohet
7b88b7525b Add support for new framebuffer protocol over adb.
This is backward compatible with the original protocol.

Change-Id: I93e811cb7775a10af82e70f31ae66d4cd74636b5
2009-09-16 16:30:50 -07:00
Piotr Gurgul
28f2b46cf4 am 66e1caff: Merge change 25298 into eclair
Merge commit '66e1caffc8c7ae8893e542ff2ee67766efcef0b5' into eclair-plus-aosp

* commit '66e1caffc8c7ae8893e542ff2ee67766efcef0b5':
  Clean up temporary files after generating coverage report
2009-09-16 12:15:12 -07:00
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
e68a5dcc91 am 82f8347e: Merge change 25163 into eclair
Merge commit '82f8347ee6edf4b8fa65a06ee93ff746730cb8f0' into eclair-plus-aosp

* commit '82f8347ee6edf4b8fa65a06ee93ff746730cb8f0':
  Replace -no-sign and -debug-sign with macrodef attribute
2009-09-15 17:13:00 -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
Piotr Gurgul
d5dbb414cc am b57c64fa: Merge change 25008 into eclair
Merge commit 'b57c64fa71d211bafc41e08fbd020a41d5027783' into eclair-plus-aosp

* commit 'b57c64fa71d211bafc41e08fbd020a41d5027783':
  Reorganize android_rules and android_test_rules
2009-09-15 16:08:35 -07:00
Xavier Ducrohet
75abfbd0a5 am 28e5f75c: Merge change 24918 into eclair
Merge commit '28e5f75c74227db192476a7cec5bcb39a6bf2d54' into eclair-plus-aosp

* commit '28e5f75c74227db192476a7cec5bcb39a6bf2d54':
  Put back support for hardware.ini at the top level of an add-on.
2009-09-15 15:59:18 -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
Raphael
b8a1e8fbce am 973def40: Merge change 24944 into eclair
Merge commit '973def409f419f673a7a3a34ecf6fcc07531338f' into eclair-plus-aosp

* commit '973def409f419f673a7a3a34ecf6fcc07531338f':
  SDK Updater: fix wrong error when unable to get repository.xml
2009-09-14 17:47:00 -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
d54c92b3a1 am e336525b: Merge change 24650 into eclair
Merge commit 'e336525b2182b41548533898071417e7dc6c1c35' into eclair-plus-aosp

* commit 'e336525b2182b41548533898071417e7dc6c1c35':
  Add <jarfile> tag to ApkBuilder ant task
2009-09-14 15:58:55 -07: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
e6067d17dc am 2196fd03: android tool: support --target symbolic target names
Merge commit '2196fd03170927e813441a79cbe4642d7cdc58d6' into eclair-plus-aosp

* commit '2196fd03170927e813441a79cbe4642d7cdc58d6':
  android tool: support --target symbolic target names
2009-09-10 16:26:57 -07:00
Raphael
2196fd0317 android tool: support --target symbolic target names
BUG 2056746

Change-Id: I579e58f7c63cf404cd11af394f41ed7f998593ce
2009-09-10 16:06:32 -07:00
Raphael
c5b2512bd8 am 5d0e8840: Merge change 24500 into eclair
Merge commit '5d0e8840cd8bd8b0589156998380ac36082ea82f' into eclair-plus-aosp

* commit '5d0e8840cd8bd8b0589156998380ac36082ea82f':
  ADT GLE: support multiple selection and alternate selection.
2009-09-10 13:43:07 -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
Xavier Ducrohet
470d4ebd22 am 1d2a56bb: Merge change 24455 into eclair
Merge commit '1d2a56bb21b7800938077aa723ca9f04ec3bc614' into eclair-plus-aosp

* commit '1d2a56bb21b7800938077aa723ca9f04ec3bc614':
  Support for hardware.ini per skin in add-ons.
2009-09-10 13:01:21 -07:00