OSDN Git Service
Piotr Gurgul [Thu, 24 Sep 2009 01:34:29 +0000 (18:34 -0700)]
am
5b6f3cbe: Add --no-locals to dx when dexing instrumented classes
Merge commit '
5b6f3cbe4b88a98262a8b30b546543b8394e1f67' into eclair-plus-aosp
* commit '
5b6f3cbe4b88a98262a8b30b546543b8394e1f67':
Add --no-locals to dx when dexing instrumented classes
Piotr Gurgul [Wed, 23 Sep 2009 22:51:44 +0000 (15:51 -0700)]
Add --no-locals to dx when dexing instrumented classes
Emma instrumentation modifies .class files in that way they cannot be processed
by dx without --no-locals option.
Piotr Gurgul [Wed, 23 Sep 2009 22:38:33 +0000 (15:38 -0700)]
am
95a32505: Merge change 26649 into eclair
Merge commit '
95a32505be164e0424d01fdd2b06c04cd54e6f06' into eclair-plus-aosp
* commit '
95a32505be164e0424d01fdd2b06c04cd54e6f06':
Define tested.project.dir property for existing samples
Android (Google) Code Review [Wed, 23 Sep 2009 22:30:28 +0000 (18:30 -0400)]
Merge change 26649 into eclair
* changes:
Define tested.project.dir property for existing samples
Brett Chabot [Wed, 23 Sep 2009 20:27:34 +0000 (13:27 -0700)]
am
9f7ae08e: Add cts-media test definition in eclair.
Merge commit '
9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb' into eclair-plus-aosp
* commit '
9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb':
Add cts-media test definition in eclair.
Piotr Gurgul [Wed, 23 Sep 2009 19:15:05 +0000 (12:15 -0700)]
Define tested.project.dir property for existing samples
As now test projects are recognized by presence of the property
tested.project.dir, it has been manually added for existing
test project samples.
Brett Chabot [Wed, 23 Sep 2009 18:38:25 +0000 (11:38 -0700)]
Add cts-media test definition in eclair.
Marco Nelissen [Wed, 23 Sep 2009 17:44:24 +0000 (10:44 -0700)]
am
265513f5: Merge change 26604 into eclair
Merge commit '
265513f5d3388f14c80a46d2fe033e0d93a9fdf1' into eclair-plus-aosp
* commit '
265513f5d3388f14c80a46d2fe033e0d93a9fdf1':
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
Xavier Ducrohet [Wed, 23 Sep 2009 17:44:19 +0000 (10:44 -0700)]
am
68cc2b00: Merge change 26490 into eclair
Merge commit '
68cc2b0084e81cdf4156a57ebd43f06da4918ccc' into eclair-plus-aosp
* commit '
68cc2b0084e81cdf4156a57ebd43f06da4918ccc':
Fix possible NPE in DDMS plugin init.
Android (Google) Code Review [Wed, 23 Sep 2009 17:38:42 +0000 (13:38 -0400)]
Merge change 26604 into eclair
* changes:
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
Android (Google) Code Review [Wed, 23 Sep 2009 17:33:35 +0000 (13:33 -0400)]
Merge change 26490 into eclair
* changes:
Fix possible NPE in DDMS plugin init.
Marco Nelissen [Wed, 23 Sep 2009 16:52:22 +0000 (09:52 -0700)]
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
Xavier Ducrohet [Wed, 23 Sep 2009 00:06:31 +0000 (17:06 -0700)]
Fix possible NPE in DDMS plugin init.
Change-Id: Ie1649b319948514473e11c27b4ad126ffe2d40ef
Xavier Ducrohet [Wed, 23 Sep 2009 03:35:07 +0000 (20:35 -0700)]
am
d582592e: Merge change 26495 into eclair
Merge commit '
d582592ea58188ad3b43523326dda5f9ae2669c7' into eclair-plus-aosp
* commit '
d582592ea58188ad3b43523326dda5f9ae2669c7':
Disable menu items based on device/app selection.
Xavier Ducrohet [Wed, 23 Sep 2009 03:35:03 +0000 (20:35 -0700)]
am
c733a529: Merge change 26521 into eclair
Merge commit '
c733a52949c8f98e57ca360cb421f480487ff774' into eclair-plus-aosp
* commit '
c733a52949c8f98e57ca360cb421f480487ff774':
Force update to the next plugin.
Android (Google) Code Review [Wed, 23 Sep 2009 03:24:32 +0000 (23:24 -0400)]
Merge change 26495 into eclair
* changes:
Disable menu items based on device/app selection.
Android (Google) Code Review [Wed, 23 Sep 2009 03:06:48 +0000 (23:06 -0400)]
Merge change 26521 into eclair
* changes:
Force update to the next plugin.
Xavier Ducrohet [Wed, 23 Sep 2009 03:01:24 +0000 (20:01 -0700)]
am
350187ab: Create Density based resource values when needed.
Merge commit '
350187ab93e12031ddcd57e5faa2312e6099ebba' into eclair-plus-aosp
* commit '
350187ab93e12031ddcd57e5faa2312e6099ebba':
Create Density based resource values when needed.
Xavier Ducrohet [Wed, 23 Sep 2009 01:32:17 +0000 (18:32 -0700)]
Create Density based resource values when needed.
This will let the layoutlib know when to scale bitmaps
that are not in the native density of the rendering.
Change-Id: I08c99666460b5b5a3ed8d0aac7fa1b7c0136fd6b
Xavier Ducrohet [Wed, 23 Sep 2009 02:51:44 +0000 (19:51 -0700)]
am
038300d9: Merge change 26471 into eclair
Merge commit '
038300d95f69ab2ddf56526bcfc5f1028c40e6f2' into eclair-plus-aosp
* commit '
038300d95f69ab2ddf56526bcfc5f1028c40e6f2':
Fix the qualifier match algorithm.
Android (Google) Code Review [Wed, 23 Sep 2009 02:40:48 +0000 (22:40 -0400)]
Merge change 26471 into eclair
* changes:
Fix the qualifier match algorithm.
Xavier Ducrohet [Wed, 23 Sep 2009 01:45:44 +0000 (18:45 -0700)]
Force update to the next plugin.
Change-Id: I2f1042a087ca6227396a41d23eed26525fbbbbf6
Piotr Gurgul [Wed, 23 Sep 2009 00:53:54 +0000 (17:53 -0700)]
am
fa0062da: Add legacy support for application.package property
Merge commit '
fa0062da90e158b18a4250a003304bf40832423a' into eclair-plus-aosp
* commit '
fa0062da90e158b18a4250a003304bf40832423a':
Add legacy support for application.package property
Xavier Ducrohet [Wed, 23 Sep 2009 00:38:24 +0000 (17:38 -0700)]
Disable menu items based on device/app selection.
Change-Id: I78572430c68f2c1952a118814d4b467182004e23
Piotr Gurgul [Wed, 23 Sep 2009 00:28:26 +0000 (17:28 -0700)]
Add legacy support for application.package property
application.package in android_rules.xml and android_test_rules.xml has been
replaced by manifest.package which value is taken from AndroidManifest.xml.
This is because old versions of build.properties contain already
application.package property which has precedence over the extracted one
and overrides it.
Change-Id: I909e145926169922ec6ec0e179ad88c413aa85b2
Xavier Ducrohet [Tue, 22 Sep 2009 22:04:35 +0000 (15:04 -0700)]
Fix the qualifier match algorithm.
Add proper support for density and keyboard state match.
Change-Id: I410aba52ee0f0d9df31fa2abdc9485054595263f
Xavier Ducrohet [Tue, 22 Sep 2009 22:04:55 +0000 (15:04 -0700)]
am
dd9683a8: Merge change 26441 into eclair
Merge commit '
dd9683a8247c8e14619d068f81d10dea10e4decb' into eclair-plus-aosp
* commit '
dd9683a8247c8e14619d068f81d10dea10e4decb':
Add support for Keyboard state "Soft"
Android (Google) Code Review [Tue, 22 Sep 2009 21:57:40 +0000 (17:57 -0400)]
Merge change 26441 into eclair
* changes:
Add support for Keyboard state "Soft"
Piotr Gurgul [Tue, 22 Sep 2009 21:28:51 +0000 (14:28 -0700)]
am
07fc39ed: Merge change 26440 into eclair
Merge commit '
07fc39edda5e53bb3ddd980a05ab2c6573685feb' into eclair-plus-aosp
* commit '
07fc39edda5e53bb3ddd980a05ab2c6573685feb':
Add auto-generated tested.project.dir property
Xavier Ducrohet [Tue, 22 Sep 2009 21:28:47 +0000 (14:28 -0700)]
am
37240333: Merge change 26436 into eclair
Merge commit '
3724033353aa535248659ad86f4d4c1c2a10fb75' into eclair-plus-aosp
* commit '
3724033353aa535248659ad86f4d4c1c2a10fb75':
Add a new skin to the SDK.
Android (Google) Code Review [Tue, 22 Sep 2009 21:21:05 +0000 (17:21 -0400)]
Merge change 26440 into eclair
* changes:
Add auto-generated tested.project.dir property
Android (Google) Code Review [Tue, 22 Sep 2009 21:18:17 +0000 (17:18 -0400)]
Merge change 26436 into eclair
* changes:
Add a new skin to the SDK.
Xavier Ducrohet [Tue, 22 Sep 2009 21:16:26 +0000 (14:16 -0700)]
Add support for Keyboard state "Soft"
Change-Id: Ief65b3988973fb3b3d9edbbb99df9354ffe85663
Piotr Gurgul [Tue, 22 Sep 2009 20:58:28 +0000 (13:58 -0700)]
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.
Xavier Ducrohet [Tue, 22 Sep 2009 20:51:14 +0000 (13:51 -0700)]
Add a new skin to the SDK.
Change-Id: I988a5a4bf372c0f8608facf64314ada1e9ee791e
Piotr Gurgul [Tue, 22 Sep 2009 18:52:04 +0000 (11:52 -0700)]
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
Android (Google) Code Review [Tue, 22 Sep 2009 18:44:28 +0000 (14:44 -0400)]
Merge change 26329 into eclair
* changes:
Distinguish jar folders and jar files in ApkBuilder script
Piotr Gurgul [Tue, 22 Sep 2009 04:02:00 +0000 (21:02 -0700)]
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.
Piotr Gurgul [Tue, 22 Sep 2009 18:21:16 +0000 (11:21 -0700)]
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
Piotr Gurgul [Tue, 22 Sep 2009 04:40:15 +0000 (21:40 -0700)]
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.
Brett Chabot [Tue, 22 Sep 2009 02:40:56 +0000 (19:40 -0700)]
am
780a7fa1: Merge change 26298 into eclair
Merge commit '
780a7fa1f51a9d42e644401ef69b79e151198794' into eclair-plus-aosp
* commit '
780a7fa1f51a9d42e644401ef69b79e151198794':
Add build path info to runtest --list_tests
Android (Google) Code Review [Tue, 22 Sep 2009 02:32:55 +0000 (22:32 -0400)]
Merge change 26298 into eclair
* changes:
Add build path info to runtest --list_tests
Brett Chabot [Tue, 22 Sep 2009 00:48:26 +0000 (17:48 -0700)]
Add build path info to runtest --list_tests
BUG
2133198
Xavier Ducrohet [Tue, 22 Sep 2009 00:49:04 +0000 (17:49 -0700)]
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.
Android (Google) Code Review [Tue, 22 Sep 2009 00:42:14 +0000 (20:42 -0400)]
Merge change 26291 into eclair
* changes:
Update the SDK/AVD manager toolbar icon tooltip to be consistent.
Piotr Gurgul [Tue, 22 Sep 2009 00:39:41 +0000 (17:39 -0700)]
am
6440b667: Merge change 26292 into eclair
Merge commit '
6440b667b07f085faf5916a1c7836597ac0f6b63' into eclair-plus-aosp
* commit '
6440b667b07f085faf5916a1c7836597ac0f6b63':
Increase reusability of zipalign macrodef
Android (Google) Code Review [Tue, 22 Sep 2009 00:31:08 +0000 (20:31 -0400)]
Merge change 26292 into eclair
* changes:
Increase reusability of zipalign macrodef
Xavier Ducrohet [Tue, 22 Sep 2009 00:29:44 +0000 (17:29 -0700)]
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.
Piotr Gurgul [Tue, 22 Sep 2009 00:22:34 +0000 (17:22 -0700)]
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.
Android (Google) Code Review [Tue, 22 Sep 2009 00:22:27 +0000 (20:22 -0400)]
Merge change 26277 into eclair
* changes:
Add an XPath Ant task to be used in the android_rules.xml file.
Xavier Ducrohet [Tue, 22 Sep 2009 00:20:48 +0000 (17:20 -0700)]
Update the SDK/AVD manager toolbar icon tooltip to be consistent.
Change-Id: Ie4c98537035e11543dd22b870880d52506ca1b99
Piotr Gurgul [Mon, 21 Sep 2009 23:55:22 +0000 (16:55 -0700)]
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
Piotr Gurgul [Thu, 17 Sep 2009 23:59:28 +0000 (16:59 -0700)]
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.
Xavier Ducrohet [Mon, 21 Sep 2009 23:10:37 +0000 (16:10 -0700)]
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" />
Derek Sollenberger [Mon, 21 Sep 2009 17:42:56 +0000 (10:42 -0700)]
am
4a9200d0: renaming setJavaClassName to setPluginStubJavaClassName
Merge commit '
4a9200d0945cd5eb4cfe7a8721c70eeec67e528e' into eclair-plus-aosp
* commit '
4a9200d0945cd5eb4cfe7a8721c70eeec67e528e':
renaming setJavaClassName to setPluginStubJavaClassName
Derek Sollenberger [Mon, 21 Sep 2009 13:15:38 +0000 (09:15 -0400)]
renaming setJavaClassName to setPluginStubJavaClassName
Change-Id: I1a962ed93e27615611a248b8791d3392ba36df1e
Jaikumar Ganesh [Sat, 19 Sep 2009 19:06:10 +0000 (12:06 -0700)]
am
bcdcd9d4: Merge change 25854 into eclair
Merge commit '
bcdcd9d4d50e50360c2ac89526dd79f30f50ac9f' into eclair-plus-aosp
* commit '
bcdcd9d4d50e50360c2ac89526dd79f30f50ac9f':
Add UUID intent to BluetoothDebug app.
Android (Google) Code Review [Sat, 19 Sep 2009 18:58:41 +0000 (14:58 -0400)]
Merge change 25854 into eclair
* changes:
Add UUID intent to BluetoothDebug app.
David 'Digit' Turner [Sat, 19 Sep 2009 07:07:40 +0000 (00:07 -0700)]
am
4d31089b: Merge change 25645 into eclair
Merge commit '
4d31089b9d3e990791a14828f899e4843443a184' into eclair-plus-aosp
* commit '
4d31089b9d3e990791a14828f899e4843443a184':
Fix the skins to do proper dpad rotation in landscape mode.
Android (Google) Code Review [Sat, 19 Sep 2009 07:01:15 +0000 (03:01 -0400)]
Merge change 25645 into eclair
* changes:
Fix the skins to do proper dpad rotation in landscape mode.
Jaikumar Ganesh [Fri, 18 Sep 2009 23:08:18 +0000 (16:08 -0700)]
Add UUID intent to BluetoothDebug app.
Change-Id: If1198f4f03eb261afe29f4c363924033aa49a477
Piotr Gurgul [Fri, 18 Sep 2009 03:08:43 +0000 (20:08 -0700)]
am
fbc5cc74: Merge change 25692 into eclair
Merge commit '
fbc5cc7488204b9b74acc587efa3c5d76a52c58b' into eclair-plus-aosp
* commit '
fbc5cc7488204b9b74acc587efa3c5d76a52c58b':
Fix a bug in processing jarfolders in ApkBuilder
Android (Google) Code Review [Fri, 18 Sep 2009 03:01:49 +0000 (23:01 -0400)]
Merge change 25692 into eclair
* changes:
Fix a bug in processing jarfolders in ApkBuilder
Piotr Gurgul [Fri, 18 Sep 2009 02:42:01 +0000 (19:42 -0700)]
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
David 'Digit' Turner [Fri, 18 Sep 2009 00:19:09 +0000 (17:19 -0700)]
Fix the skins to do proper dpad rotation in landscape mode.
Eric Fischer [Thu, 17 Sep 2009 22:08:52 +0000 (15:08 -0700)]
am
9cc8b3f0: Import revised translations. DO NOT MERGE
Merge commit '
9cc8b3f04494cce6b37761eccb259d781dbb5ad6' into eclair-plus-aosp
* commit '
9cc8b3f04494cce6b37761eccb259d781dbb5ad6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:27:17 +0000 (14:27 -0700)]
Import revised translations. DO NOT MERGE
Patrick Scott [Thu, 17 Sep 2009 20:09:39 +0000 (13:09 -0700)]
am
107621ad: Merge change 25538 into eclair
Merge commit '
107621ad3120121bfd0eec59f2069995fbe27b0b' into eclair-plus-aosp
* commit '
107621ad3120121bfd0eec59f2069995fbe27b0b':
Do not install libsampleplugin by default.
Android (Google) Code Review [Thu, 17 Sep 2009 20:01:19 +0000 (16:01 -0400)]
Merge change 25538 into eclair
* changes:
Do not install libsampleplugin by default.
Piotr Gurgul [Thu, 17 Sep 2009 19:31:02 +0000 (12:31 -0700)]
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
Android (Google) Code Review [Thu, 17 Sep 2009 19:23:23 +0000 (15:23 -0400)]
Merge change 25340 into eclair
* changes:
Specify emma dump file location on the device explicitly
Patrick Scott [Thu, 17 Sep 2009 19:06:19 +0000 (15:06 -0400)]
Do not install libsampleplugin by default.
This avoids installing the library during a normal build. When building
SampleBrowserPlugin, the library will be packaged in the apk.
Xavier Ducrohet [Thu, 17 Sep 2009 15:43:26 +0000 (08:43 -0700)]
am
8399a2bf: Merge change 25229 into eclair
Merge commit '
8399a2bf6d415dc20788167b70b98e24b285466d' into eclair-plus-aosp
* commit '
8399a2bf6d415dc20788167b70b98e24b285466d':
Add support for new framebuffer protocol over adb.
Android (Google) Code Review [Thu, 17 Sep 2009 00:11:48 +0000 (20:11 -0400)]
Merge change 25229 into eclair
* changes:
Add support for new framebuffer protocol over adb.
Piotr Gurgul [Wed, 16 Sep 2009 20:29:07 +0000 (13:29 -0700)]
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.
Xavier Ducrohet [Wed, 16 Sep 2009 03:09:08 +0000 (20:09 -0700)]
Add support for new framebuffer protocol over adb.
This is backward compatible with the original protocol.
Change-Id: I93e811cb7775a10af82e70f31ae66d4cd74636b5
Piotr Gurgul [Wed, 16 Sep 2009 19:15:12 +0000 (12:15 -0700)]
am
66e1caff: Merge change 25298 into eclair
Merge commit '
66e1caffc8c7ae8893e542ff2ee67766efcef0b5' into eclair-plus-aosp
* commit '
66e1caffc8c7ae8893e542ff2ee67766efcef0b5':
Clean up temporary files after generating coverage report
Android (Google) Code Review [Wed, 16 Sep 2009 19:04:27 +0000 (15:04 -0400)]
Merge change 25298 into eclair
* changes:
Clean up temporary files after generating coverage report
Brett Chabot [Wed, 16 Sep 2009 18:30:37 +0000 (11:30 -0700)]
am
c1d51f75: Merge change 25165 into eclair
Merge commit '
c1d51f7544c5aeaca70f1f769965a621869b5c82' into eclair-plus-aosp
* commit '
c1d51f7544c5aeaca70f1f769965a621869b5c82':
Remove IM from code coverage targets.
Android (Google) Code Review [Wed, 16 Sep 2009 18:23:10 +0000 (14:23 -0400)]
Merge change 25165 into eclair
* changes:
Remove IM from code coverage targets.
Piotr Gurgul [Wed, 16 Sep 2009 17:43:19 +0000 (10:43 -0700)]
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.
Nicolas Catania [Wed, 16 Sep 2009 02:25:33 +0000 (19:25 -0700)]
am
765bec77: Merge change 25093 into eclair
Merge commit '
765bec77d5ed3f3bbda52d1b6015fc9fd7203971' into eclair-plus-aosp
* commit '
765bec77d5ed3f3bbda52d1b6015fc9fd7203971':
Added new telephony unittest target.
Android (Google) Code Review [Wed, 16 Sep 2009 02:17:14 +0000 (22:17 -0400)]
Merge change 25093 into eclair
* changes:
Added new telephony unittest target.
Derek Sollenberger [Wed, 16 Sep 2009 00:13:09 +0000 (17:13 -0700)]
am
33769eea: Merge change 24203 into eclair
Merge commit '
33769eea082e0fece00f9cc16995f1edba5bfeb0' into eclair-plus-aosp
* commit '
33769eea082e0fece00f9cc16995f1edba5bfeb0':
Updating samplePlugin to use java surface views.
Derek Sollenberger [Wed, 16 Sep 2009 00:13:05 +0000 (17:13 -0700)]
am
3b3de839: Merge change 23489 into eclair
Merge commit '
3b3de83970037c9fec707dbdb06af2835b9f5913' into eclair-plus-aosp
* commit '
3b3de83970037c9fec707dbdb06af2835b9f5913':
adding support for plugins to use the java view system.
Piotr Gurgul [Wed, 16 Sep 2009 00:13:00 +0000 (17:13 -0700)]
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
Android (Google) Code Review [Wed, 16 Sep 2009 00:03:26 +0000 (20:03 -0400)]
Merge change 24203 into eclair
* changes:
Updating samplePlugin to use java surface views.
Android (Google) Code Review [Wed, 16 Sep 2009 00:03:09 +0000 (20:03 -0400)]
Merge change 23489 into eclair
* changes:
adding support for plugins to use the java view system.
Android (Google) Code Review [Wed, 16 Sep 2009 00:01:49 +0000 (20:01 -0400)]
Merge change 25163 into eclair
* changes:
Replace -no-sign and -debug-sign with macrodef attribute
Brett Chabot [Tue, 15 Sep 2009 23:56:37 +0000 (16:56 -0700)]
Remove IM from code coverage targets.
Necessary since IM is no longer part of the Android source tree.
Xavier Ducrohet [Tue, 15 Sep 2009 23:47:59 +0000 (16:47 -0700)]
am
e6fa8c19: Merge change 25140 into eclair
Merge commit '
e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8' into eclair-plus-aosp
* commit '
e6fa8c193c502bd4a44e6e0c22ddbb3f60c72ee8':
Add 64bit SWT to Mac SDK build.
Piotr Gurgul [Tue, 15 Sep 2009 23:38:40 +0000 (16:38 -0700)]
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.
Android (Google) Code Review [Tue, 15 Sep 2009 23:40:06 +0000 (19:40 -0400)]
Merge change 25140 into eclair
* changes:
Add 64bit SWT to Mac SDK build.
Derek Sollenberger [Tue, 8 Sep 2009 22:36:29 +0000 (18:36 -0400)]
Updating samplePlugin to use java surface views.
Change-Id: I1b925ce3a6aeb0bd5464a7d5711449029944d7de
Derek Sollenberger [Tue, 1 Sep 2009 20:27:31 +0000 (16:27 -0400)]
adding support for plugins to use the java view system.
Change-Id: I7305300dfc09e3e0968a1e61c21a6a2cdb983594
Piotr Gurgul [Tue, 15 Sep 2009 23:08:35 +0000 (16:08 -0700)]
am
b57c64fa: Merge change 25008 into eclair
Merge commit '
b57c64fa71d211bafc41e08fbd020a41d5027783' into eclair-plus-aosp
* commit '
b57c64fa71d211bafc41e08fbd020a41d5027783':
Reorganize android_rules and android_test_rules
Xavier Ducrohet [Tue, 15 Sep 2009 22:59:18 +0000 (15:59 -0700)]
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.
Android (Google) Code Review [Tue, 15 Sep 2009 22:58:34 +0000 (18:58 -0400)]
Merge change 25008 into eclair
* changes:
Reorganize android_rules and android_test_rules
Android (Google) Code Review [Tue, 15 Sep 2009 22:50:59 +0000 (18:50 -0400)]
Merge change 24918 into eclair
* changes:
Put back support for hardware.ini at the top level of an add-on.
Xavier Ducrohet [Tue, 15 Sep 2009 22:45:19 +0000 (15:45 -0700)]
Add 64bit SWT to Mac SDK build.
Change-Id: Ie30153644733d5a22453eea2c66551e4aaa03316