Merge commit '75abfbd0a575b7747279a9059d46a4741f0ca5cd'
* commit '75abfbd0a575b7747279a9059d46a4741f0ca5cd':
Put back support for hardware.ini at the top level of an add-on.
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.
Merge commit 'c1d51f7544c5aeaca70f1f769965a621869b5c82' into eclair-plus-aosp
* commit 'c1d51f7544c5aeaca70f1f769965a621869b5c82':
Remove IM from code coverage targets.
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.
Merge commit '33769eea082e0fece00f9cc16995f1edba5bfeb0' into eclair-plus-aosp
* commit '33769eea082e0fece00f9cc16995f1edba5bfeb0':
Updating samplePlugin to use java surface views.
Merge commit '3b3de83970037c9fec707dbdb06af2835b9f5913' into eclair-plus-aosp
* commit '3b3de83970037c9fec707dbdb06af2835b9f5913':
adding support for plugins to use the java view system.
Merge commit '82f8347ee6edf4b8fa65a06ee93ff746730cb8f0' into eclair-plus-aosp
* commit '82f8347ee6edf4b8fa65a06ee93ff746730cb8f0':
Replace -no-sign and -debug-sign with macrodef attribute
Merge commit 'e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8' into eclair-plus-aosp
* commit 'e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8':
Add 64bit SWT to Mac SDK build.
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.
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.
Added the long press keyword and event.
modified: src/com/android/commands/monkey/MonkeySourceScript.java
modified: src/com/android/commands/monkey/MonkeySourceScript.java
modified: src/com/android/commands/monkey/MonkeySourceScript.java
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 '48e8ca1f521d33a3d9051db08d06f435906199d6' into eclair-plus-aosp
* commit '48e8ca1f521d33a3d9051db08d06f435906199d6':
Add BluetoothDebug.apk for testing and debugging Bluetooth.
Currently it just registers a receiver for all Bluetooth intents,
and prints them to logcat. For example:
BTDEBUG : a.b.device.a.FOUND
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.e.RSSI = -35
BTDEBUG : a.b.device.e.CLASS = 200404
BTDEBUG : a.b.adapter.a.DISCOVERY_FINISHED
BTDEBUG : a.b.device.a.BOND_STATE_CHANGED
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.e.BOND_STATE = 11
BTDEBUG : a.b.device.e.PREVIOUS_BOND_STATE = 10
BTDEBUG : a.b.device.a.ACL_CONNECTED
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.a.NAME_CHANGED
BTDEBUG : a.b.device.e.DEVICE = 00:18:13:F2:CC:33
BTDEBUG : a.b.device.e.NAME = "HBH-IV840"
This application is built by default, but is not installed. Use
mmm development/apps/BluetoothDebug
adb install -r $OUT/system/app/BluetoothDebug.apk
to install it. Logging will begin immediately.
Change-Id: I582e6415fc1c856a6a4581ecf52eda11818601cf
