OSDN Git Service
Mike Lockwood [Mon, 7 Dec 2009 16:09:53 +0000 (08:09 -0800)]
am
623a5572: resolved conflicts for merge of
882ad42e to eclair-mr2
Merge commit '
623a5572e894c2114767f5631165354076d0b139' into eclair-mr2-plus-aosp
* commit '
623a5572e894c2114767f5631165354076d0b139':
Add clean step for switching GPS API from pdapi to loc_api
Mike Lockwood [Mon, 7 Dec 2009 15:52:22 +0000 (10:52 -0500)]
resolved conflicts for merge of
882ad42e to eclair-mr2
Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
Mike Lockwood [Mon, 7 Dec 2009 12:23:25 +0000 (07:23 -0500)]
Add clean step for switching GPS API from pdapi to loc_api
Change-Id: Ifa75b0865b547f5e643a4466f13ec7485e902e5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Bjorn Bringert [Sat, 5 Dec 2009 20:38:22 +0000 (12:38 -0800)]
am
e15968b4: Clean step for the move of SearchableInfo to android.app
Merge commit '
e15968b47a30fb6411a682ac06a5d93ea89011b0' into eclair-mr2-plus-aosp
* commit '
e15968b47a30fb6411a682ac06a5d93ea89011b0':
Clean step for the move of SearchableInfo to android.app
Doug Zongker [Sat, 5 Dec 2009 20:38:19 +0000 (12:38 -0800)]
am
56a01cbb: am
e81271f5: Merge change Id97eba9f into eclair
Merge commit '
56a01cbb5cc11bedeef2f033fc31e370c7401f4a' into eclair-mr2-plus-aosp
* commit '
56a01cbb5cc11bedeef2f033fc31e370c7401f4a':
don't add "ota-rel-keys" tag to build fingerprints
Bjorn Bringert [Fri, 4 Dec 2009 12:50:46 +0000 (12:50 +0000)]
Clean step for the move of SearchableInfo to android.app
This is part of http://b/issue?id=
2270838
Change-Id: I4f70549f0a15e5c90fa5297a2af9f872bb5312a1
Doug Zongker [Fri, 4 Dec 2009 18:40:59 +0000 (10:40 -0800)]
am
e81271f5: Merge change Id97eba9f into eclair
Merge commit '
e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-mr2
* commit '
e81271f526db01af84eabdd99d309c9425d3f1a3':
don't add "ota-rel-keys" tag to build fingerprints
Doug Zongker [Fri, 4 Dec 2009 18:40:39 +0000 (10:40 -0800)]
am
6c4a70c6: Merge change I672b05c4 into eclair-mr2
Merge commit '
6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp
* commit '
6c4a70c64d45545814ba60ad8ad3a95474ea0944':
make build depend on event-log-tags file
Dianne Hackborn [Fri, 4 Dec 2009 18:37:09 +0000 (10:37 -0800)]
am
176c758c: Change version to MR2 development.
Merge commit '
176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp
* commit '
176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
Change version to MR2 development.
Android (Google) Code Review [Fri, 4 Dec 2009 18:36:44 +0000 (10:36 -0800)]
Merge change Id97eba9f into eclair
* changes:
don't add "ota-rel-keys" tag to build fingerprints
Android (Google) Code Review [Fri, 4 Dec 2009 18:36:31 +0000 (10:36 -0800)]
Merge change I672b05c4 into eclair-mr2
* changes:
make build depend on event-log-tags file
Doug Zongker [Fri, 4 Dec 2009 18:05:20 +0000 (10:05 -0800)]
make build depend on event-log-tags file
Oops, I forgot to make the build actually require the event-log-tags file.
Dianne Hackborn [Fri, 4 Dec 2009 00:42:23 +0000 (16:42 -0800)]
Change version to MR2 development.
Doug Zongker [Fri, 4 Dec 2009 01:37:37 +0000 (17:37 -0800)]
don't add "ota-rel-keys" tag to build fingerprints
This tag is obsolete; we no longer need to distinguish the OTA keys
from the app keys.
This change does not affect device code.
Doug Zongker [Fri, 4 Dec 2009 01:05:52 +0000 (17:05 -0800)]
am
485847e4: Merge change I6f85805b into eclair-mr2
Merge commit '
485847e4c47e1504ddf8b830d557211d02a76e57' into eclair-mr2-plus-aosp
* commit '
485847e4c47e1504ddf8b830d557211d02a76e57':
break up event-log-tags; generate java source files with constants
Android (Google) Code Review [Fri, 4 Dec 2009 00:58:40 +0000 (16:58 -0800)]
Merge change I6f85805b into eclair-mr2
* changes:
break up event-log-tags; generate java source files with constants
Doug Zongker [Fri, 4 Dec 2009 00:57:45 +0000 (16:57 -0800)]
am
e4ea0ab8: am
ae91c7f8: Merge change I5ecba70c into eclair
Merge commit '
e4ea0ab8bd1ceef94399ac028e4fed1c18333b98' into eclair-mr2-plus-aosp
* commit '
e4ea0ab8bd1ceef94399ac028e4fed1c18333b98':
add missing comma
Doug Zongker [Mon, 30 Nov 2009 22:28:59 +0000 (14:28 -0800)]
break up event-log-tags; generate java source files with constants
Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)
For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
Doug Zongker [Fri, 4 Dec 2009 00:43:37 +0000 (16:43 -0800)]
am
ae91c7f8: Merge change I5ecba70c into eclair
Merge commit '
ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8' into eclair-mr2
* commit '
ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8':
add missing comma
Android (Google) Code Review [Fri, 4 Dec 2009 00:38:44 +0000 (16:38 -0800)]
Merge change I5ecba70c into eclair
* changes:
add missing comma
Doug Zongker [Fri, 4 Dec 2009 00:36:20 +0000 (16:36 -0800)]
add missing comma
A missing comma is breaking the option parsing for the signing tools
(this doesn't affect any device code, only the signing tools).
Ying Wang [Fri, 4 Dec 2009 00:34:23 +0000 (16:34 -0800)]
am
cc674300: am
35b84b28: Overwrite android-info instead of appending to it
Merge commit '
cc6743007c416a4c19fa89d8c3088202bd456cc5' into eclair-mr2-plus-aosp
* commit '
cc6743007c416a4c19fa89d8c3088202bd456cc5':
Overwrite android-info instead of appending to it
Dan Bornstein [Fri, 4 Dec 2009 00:34:20 +0000 (16:34 -0800)]
am
dc04cc89: am
0706e6a4: Merge change I485df382 into eclair
Merge commit '
dc04cc892abfbd1405a44c90f3cbd72c7e040bd3' into eclair-mr2-plus-aosp
* commit '
dc04cc892abfbd1405a44c90f3cbd72c7e040bd3':
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
Ying Wang [Thu, 3 Dec 2009 19:50:32 +0000 (11:50 -0800)]
am
35b84b28: Overwrite android-info instead of appending to it
Merge commit '
35b84b287f9cba2d098d28eb0e3b44abd6ae131a' into eclair-mr2
* commit '
35b84b287f9cba2d098d28eb0e3b44abd6ae131a':
Overwrite android-info instead of appending to it
Dan Bornstein [Thu, 3 Dec 2009 19:50:27 +0000 (11:50 -0800)]
am
0706e6a4: Merge change I485df382 into eclair
Merge commit '
0706e6a4a3e6b80c11aae1648a3876c59929c48f' into eclair-mr2
* commit '
0706e6a4a3e6b80c11aae1648a3876c59929c48f':
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
Ying Wang [Thu, 3 Dec 2009 19:25:47 +0000 (11:25 -0800)]
Overwrite android-info instead of appending to it
if someone changes board-info.txt, then it should be copied out to
out/target/product/<device>/android-info.txt, instead of appending.
Doug Zongker [Wed, 2 Dec 2009 01:30:37 +0000 (17:30 -0800)]
am
d816500c: am
8bec09ee: add \'extras\' mechanism to OTA and signing tools
Merge commit '
d816500cdd5ca4e017f2fe16fa9ec27205dc2e28' into eclair-mr2-plus-aosp
* commit '
d816500cdd5ca4e017f2fe16fa9ec27205dc2e28':
add 'extras' mechanism to OTA and signing tools
Doug Zongker [Wed, 2 Dec 2009 01:30:34 +0000 (17:30 -0800)]
am
9b3c88e1: remove mkkey.sh from build
Merge commit '
9b3c88e19fb29ba3227f32fbf58fec4516ec9855' into eclair-mr2-plus-aosp
* commit '
9b3c88e19fb29ba3227f32fbf58fec4516ec9855':
remove mkkey.sh from build
Doug Zongker [Wed, 2 Dec 2009 01:14:51 +0000 (17:14 -0800)]
am
8bec09ee: add \'extras\' mechanism to OTA and signing tools
Merge commit '
8bec09ee7264160e4e08973a0efcc6bd2c898925' into eclair-mr2
* commit '
8bec09ee7264160e4e08973a0efcc6bd2c898925':
add 'extras' mechanism to OTA and signing tools
Doug Zongker [Tue, 1 Dec 2009 20:42:30 +0000 (12:42 -0800)]
remove mkkey.sh from build
Update README with instructions on using the new make_key script
instead.
Android (Google) Code Review [Tue, 1 Dec 2009 20:26:41 +0000 (12:26 -0800)]
Merge change I485df382 into eclair
* changes:
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
Doug Zongker [Mon, 30 Nov 2009 23:37:14 +0000 (15:37 -0800)]
add 'extras' mechanism to OTA and signing tools
Add the -x option which allows arbitrary key-value pairs to be passed
into the device-specific module for doing signing and OTA packaging.
Brian Swetland [Wed, 25 Nov 2009 22:31:12 +0000 (14:31 -0800)]
am
8c1eeffe: am
2b80317b: only auto-generate board= requirement if a board-info file is not specified
Merge commit '
8c1eeffe4339530cb76572588330a698bccb622c' into eclair-mr2-plus-aosp
* commit '
8c1eeffe4339530cb76572588330a698bccb622c':
only auto-generate board= requirement if a board-info file is not specified
Brian Swetland [Wed, 25 Nov 2009 22:27:20 +0000 (14:27 -0800)]
am
2b80317b: only auto-generate board= requirement if a board-info file is not specified
Merge commit '
2b80317be27e5450d7212b10777992d782dcf90e' into eclair-mr2
* commit '
2b80317be27e5450d7212b10777992d782dcf90e':
only auto-generate board= requirement if a board-info file is not specified
Brian Swetland [Wed, 25 Nov 2009 21:43:25 +0000 (13:43 -0800)]
only auto-generate board= requirement if a board-info file is not specified
If a board-info file is specified (as is usually the case) we should honor
its requirements.
Dan Bornstein [Tue, 24 Nov 2009 23:48:50 +0000 (15:48 -0800)]
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
This makes runtest, in particular, happier, since it will now find that
its idea of the cwd actually matches with what's claimed in ANDROID_BUILD_TOP.
Change-Id: I485df382d9d314a73b410030bf2116215b6250f9
Jean-Baptiste Queru [Tue, 24 Nov 2009 23:04:26 +0000 (15:04 -0800)]
am
69ed23d0: resolved conflicts for merge of
636458dd to eclair-mr2
Merge commit '
69ed23d097f8d72aecb36b1b75e89ac101c4691a' into eclair-mr2-plus-aosp
* commit '
69ed23d097f8d72aecb36b1b75e89ac101c4691a':
clean step for build.prop
Jean-Baptiste Queru [Tue, 24 Nov 2009 22:58:54 +0000 (14:58 -0800)]
resolved conflicts for merge of
636458dd to eclair-mr2
Mathias Agopian [Tue, 24 Nov 2009 07:14:44 +0000 (23:14 -0800)]
clean step for build.prop
Dan Egnor [Tue, 24 Nov 2009 00:45:04 +0000 (16:45 -0800)]
am
7e39fc23: Add cleanspec to remove an old, historical package which no longer exists but nevertheless gets loaded into the system process and then crashes because classes it uses don\'t exist any more.
Merge commit '
7e39fc235185abd445f43674431b5796d3965bdd' into eclair-mr2-plus-aosp
* commit '
7e39fc235185abd445f43674431b5796d3965bdd':
Add cleanspec to remove an old, historical package which
Dan Egnor [Tue, 24 Nov 2009 00:35:33 +0000 (16:35 -0800)]
Add cleanspec to remove an old, historical package which
no longer exists but nevertheless gets loaded into the system
process and then crashes because classes it uses don't exist
any more.
Scott Main [Mon, 23 Nov 2009 21:10:35 +0000 (13:10 -0800)]
am
3bfb5192: am
0086ab50: am
1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '
3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc' into eclair-mr2-plus-aosp
* commit '
3bfb5192cb2abb725d75dcbea4b58a6cbb2903fc':
droiddoc change: revise the sample code generating script so that
Scott Main [Mon, 23 Nov 2009 21:06:55 +0000 (13:06 -0800)]
am
0086ab50: am
1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '
0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-mr2
* commit '
0086ab50631cfc6abb0f591871f5bb5da74e4606':
droiddoc change: revise the sample code generating script so that
Scott Main [Mon, 23 Nov 2009 21:02:17 +0000 (13:02 -0800)]
am
1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '
1a177879281ac6ed541a8f875c0130c3355ab6f9' into eclair
* commit '
1a177879281ac6ed541a8f875c0130c3355ab6f9':
droiddoc change: revise the sample code generating script so that
Android (Google) Code Review [Mon, 23 Nov 2009 20:55:36 +0000 (12:55 -0800)]
Merge change I06c40454 into eclair-sdk
* changes:
droiddoc change: revise the sample code generating script so that all the source code pages are NOT generated for the offline version of the docs (only show source in html for online docs).
Scott Main [Sat, 21 Nov 2009 00:47:22 +0000 (16:47 -0800)]
am
ff17131e: am
c3467e43: am
4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '
ff17131e6c45337663ec8c086185cdbd2c8ca10a' into eclair-mr2-plus-aosp
* commit '
ff17131e6c45337663ec8c086185cdbd2c8ca10a':
docs: change the ADP image for the homepage carousel
Scott Main [Sat, 21 Nov 2009 00:42:55 +0000 (16:42 -0800)]
am
c3467e43: am
4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '
c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-mr2
* commit '
c3467e43febbc39cbb43afe25dd988641e2f0218':
docs: change the ADP image for the homepage carousel
Scott Main [Sat, 21 Nov 2009 00:38:47 +0000 (16:38 -0800)]
am
4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '
4cdb7149127d9527411ed73e26604a2cf2292435' into eclair
* commit '
4cdb7149127d9527411ed73e26604a2cf2292435':
docs: change the ADP image for the homepage carousel
Scott Main [Sat, 21 Nov 2009 00:22:14 +0000 (16:22 -0800)]
docs: change the ADP image for the homepage carousel
Change-Id: I6141f32e18918d51d72cfa645f0ceea709002cc6
Dan Bornstein [Sat, 21 Nov 2009 00:07:29 +0000 (16:07 -0800)]
am
aa71af7f: am
bb0c8804: Add Bluetooth to the test list.
Merge commit '
aa71af7f8efa812b65461e4d3ca39aae1dd23b8b' into eclair-mr2-plus-aosp
* commit '
aa71af7f8efa812b65461e4d3ca39aae1dd23b8b':
Add Bluetooth to the test list.
Dan Bornstein [Sat, 21 Nov 2009 00:03:22 +0000 (16:03 -0800)]
am
bb0c8804: Add Bluetooth to the test list.
Merge commit '
bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-mr2
* commit '
bb0c8804dd7440d589ef8845960ad8b76d4b6617':
Add Bluetooth to the test list.
Dan Bornstein [Fri, 20 Nov 2009 21:13:41 +0000 (13:13 -0800)]
Add Bluetooth to the test list.
Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
Scott Main [Fri, 20 Nov 2009 18:41:49 +0000 (10:41 -0800)]
droiddoc change: revise the sample code generating script so that
all the source code pages are NOT generated for the offline version
of the docs (only show source in html for online docs).
This won't work until a companion change from framwork/base/Android.mk
is submitted (but shouldn't break the build).
Change-Id: I06c404540870071c2a5a8aa460e156506fd975cb
Scott Main [Fri, 20 Nov 2009 18:04:01 +0000 (10:04 -0800)]
am
7bcb88ff: am
c00b2cf9: am
91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '
7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8' into eclair-mr2-plus-aosp
* commit '
7bcb88ff08564dba5f9e41d8fea3914a49e4e5d8':
docs: revise user agent detection to use lower case
Scott Main [Fri, 20 Nov 2009 17:59:46 +0000 (09:59 -0800)]
am
c00b2cf9: am
91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '
c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-mr2
* commit '
c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd':
docs: revise user agent detection to use lower case
Scott Main [Fri, 20 Nov 2009 17:55:08 +0000 (09:55 -0800)]
am
91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '
91ed9bbbdce1990782b4ac86650f9c79bb94d961' into eclair
* commit '
91ed9bbbdce1990782b4ac86650f9c79bb94d961':
docs: revise user agent detection to use lower case
Android (Google) Code Review [Fri, 20 Nov 2009 17:38:18 +0000 (09:38 -0800)]
Merge change Id8115ffb into eclair-sdk
* changes:
docs: revise user agent detection to use lower case for string comparisons and add 'webos' as a mobile device
Dirk Dougherty [Thu, 19 Nov 2009 19:48:16 +0000 (11:48 -0800)]
am
952ea818: am
aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit '
952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3' into eclair-mr2-plus-aosp
* commit '
952ea81886d2e0b8c5f66504db01b0b1cb3a4ef3':
sdk doc change for esr: update version refs to 2.0.1.
Dan Bornstein [Thu, 19 Nov 2009 19:48:13 +0000 (11:48 -0800)]
am
d867551e: am
ffbe862d: Merge change I60b2633b into eclair
Merge commit '
d867551efea52a7d342b8fd2ed08fc9939090e88' into eclair-mr2-plus-aosp
* commit '
d867551efea52a7d342b8fd2ed08fc9939090e88':
Add the JNI test to the CTS list.
Dirk Dougherty [Thu, 19 Nov 2009 19:42:29 +0000 (11:42 -0800)]
am
aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit '
aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-mr2
* commit '
aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
sdk doc change for esr: update version refs to 2.0.1.
Dan Bornstein [Thu, 19 Nov 2009 19:41:59 +0000 (11:41 -0800)]
am
ffbe862d: Merge change I60b2633b into eclair
Merge commit '
ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-mr2
* commit '
ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
Android (Google) Code Review [Thu, 19 Nov 2009 19:24:29 +0000 (11:24 -0800)]
Merge change Ib5817a3a into eclair
* changes:
sdk doc change for esr: update version refs to 2.0.1.
Dianne Hackborn [Thu, 19 Nov 2009 19:02:49 +0000 (11:02 -0800)]
am
07e1232a: resolved conflicts for merge of
90b35770 to eclair-mr2
Merge commit '
07e1232a2dc2887ba0003d629032c21fbb426652' into eclair-mr2-plus-aosp
* commit '
07e1232a2dc2887ba0003d629032c21fbb426652':
Update version name to 2.1 and API to 7.
Dianne Hackborn [Thu, 19 Nov 2009 18:57:12 +0000 (10:57 -0800)]
resolved conflicts for merge of
90b35770 to eclair-mr2
Android (Google) Code Review [Thu, 19 Nov 2009 18:43:07 +0000 (10:43 -0800)]
Merge change I60b2633b into eclair
* changes:
Add the JNI test to the CTS list.
Dirk Dougherty [Thu, 19 Nov 2009 07:15:13 +0000 (23:15 -0800)]
sdk doc change for esr: update version refs to 2.0.1.
Bug:
2160782
Android (Google) Code Review [Thu, 19 Nov 2009 02:17:46 +0000 (18:17 -0800)]
Merge change If922a88c into eclair
* changes:
Update version name to 2.1 and API to 7.
Dan Egnor [Thu, 19 Nov 2009 01:55:30 +0000 (17:55 -0800)]
am
1f816cf5: Merge change I362bebd3 into eclair-mr2
Merge commit '
1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp
* commit '
1f816cf57b93654638989e6007d669c04b3d9b88':
Include the common source files directly in the framework library
Raphael [Thu, 19 Nov 2009 01:55:09 +0000 (17:55 -0800)]
am
c3d743d2: am
81d88c31: am
d920ec83: Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '
c3d743d262cd69e817524f8a4e5554ef29ffa837' into eclair-mr2-plus-aosp
* commit '
c3d743d262cd69e817524f8a4e5554ef29ffa837':
Fix a Windows-only discrepency in the Windows SDK build.
Raphael [Thu, 19 Nov 2009 01:55:05 +0000 (17:55 -0800)]
am
6f5cb991: am
f15e028f: am
a62a4421: Fix the Windows SDK build for the development to sdk split.
Merge commit '
6f5cb991f61acbc21090c3744d5bf16b01b7aa52' into eclair-mr2-plus-aosp
* commit '
6f5cb991f61acbc21090c3744d5bf16b01b7aa52':
Fix the Windows SDK build for the development to sdk split.
Xavier Ducrohet [Thu, 19 Nov 2009 01:55:02 +0000 (17:55 -0800)]
am
802bb072: am
258b2b45: am
1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '
802bb072c2d9efaac1c46ac13d7e69a0aaf936a9' into eclair-mr2-plus-aosp
* commit '
802bb072c2d9efaac1c46ac13d7e69a0aaf936a9':
Change where makefile looks for sdk_clean.sh
Scott Main [Thu, 19 Nov 2009 01:54:57 +0000 (17:54 -0800)]
am
7239d522: am
ec9baf22: am
9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '
7239d522c59661129850d818fe6986074b6aa002' into eclair-mr2-plus-aosp
* commit '
7239d522c59661129850d818fe6986074b6aa002':
docs: make all javadoc reference links use <code>
Dianne Hackborn [Thu, 19 Nov 2009 01:37:15 +0000 (17:37 -0800)]
Update version name to 2.1 and API to 7.
Change-Id: If922a88c1f3e99553ec5df9b870713eab1c53c54
Dan Bornstein [Thu, 19 Nov 2009 01:18:07 +0000 (17:18 -0800)]
Add the JNI test to the CTS list.
Change-Id: I60b2633b98ccb06551e521ff229ed12c897cc2e6
Android (Google) Code Review [Thu, 19 Nov 2009 01:22:32 +0000 (17:22 -0800)]
Merge change I362bebd3 into eclair-mr2
* changes:
Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.
Raphael [Thu, 19 Nov 2009 01:17:54 +0000 (17:17 -0800)]
am
81d88c31: am
d920ec83: Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '
81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2
* commit '
81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
Raphael [Thu, 19 Nov 2009 01:17:51 +0000 (17:17 -0800)]
am
f15e028f: am
a62a4421: Fix the Windows SDK build for the development to sdk split.
Merge commit '
f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2
* commit '
f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
Xavier Ducrohet [Thu, 19 Nov 2009 01:17:47 +0000 (17:17 -0800)]
am
258b2b45: am
1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '
258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-mr2
* commit '
258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
Scott Main [Thu, 19 Nov 2009 01:17:43 +0000 (17:17 -0800)]
am
ec9baf22: am
9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '
ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-mr2
* commit '
ec9baf22a959af85f77f56360e95a738f360c4f0':
docs: make all javadoc reference links use <code>
Raphael [Thu, 19 Nov 2009 01:12:39 +0000 (17:12 -0800)]
am
d920ec83: Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '
d920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair
* commit '
d920ec8354940653e6cf53a1540360cca3bcc5f7':
Fix a Windows-only discrepency in the Windows SDK build.
Raphael [Thu, 19 Nov 2009 01:11:57 +0000 (17:11 -0800)]
am
a62a4421: Fix the Windows SDK build for the development to sdk split.
Merge commit '
a62a442129a28bf3a62139183868a13b91e976ad' into eclair
* commit '
a62a442129a28bf3a62139183868a13b91e976ad':
Fix the Windows SDK build for the development to sdk split.
Xavier Ducrohet [Thu, 19 Nov 2009 01:11:53 +0000 (17:11 -0800)]
am
1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '
1ae988040777f88f766fc421af79a61175e917af' into eclair
* commit '
1ae988040777f88f766fc421af79a61175e917af':
Change where makefile looks for sdk_clean.sh
Scott Main [Thu, 19 Nov 2009 01:11:50 +0000 (17:11 -0800)]
am
9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '
9a5c84020595eac7e20fce036a9afd7c06766457' into eclair
* commit '
9a5c84020595eac7e20fce036a9afd7c06766457':
docs: make all javadoc reference links use <code>
Dan Egnor [Wed, 18 Nov 2009 22:42:40 +0000 (14:42 -0800)]
Include the common source files directly in the framework library
when building, to allow mutual interdependencies; the common static
library will be built independently.
Brett Chabot [Wed, 18 Nov 2009 22:50:23 +0000 (14:50 -0800)]
am
b4805a18: am
2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '
b4805a18e51d3a18caa2cac821479a9535778d58' into eclair-mr2-plus-aosp
* commit '
b4805a18e51d3a18caa2cac821479a9535778d58':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Brett Chabot [Wed, 18 Nov 2009 22:46:22 +0000 (14:46 -0800)]
am
2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '
2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2
* commit '
2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Brett Chabot [Thu, 12 Nov 2009 21:29:07 +0000 (13:29 -0800)]
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Bug
2099347
Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
Raphael [Wed, 18 Nov 2009 22:16:04 +0000 (14:16 -0800)]
Fix a Windows-only discrepency in the Windows SDK build.
For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.
Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
Jeff Hamilton [Wed, 18 Nov 2009 21:31:12 +0000 (13:31 -0800)]
am
f1cecce8: Merge change I4414f233 into eclair-mr2
Merge commit '
f1cecce82f98d96e564cc44dd01c50909f2d7818' into eclair-mr2-plus-aosp
* commit '
f1cecce82f98d96e564cc44dd01c50909f2d7818':
Remove references to com.google.android.gtalkservice.xml.
Android (Google) Code Review [Wed, 18 Nov 2009 21:26:15 +0000 (13:26 -0800)]
Merge change I4414f233 into eclair-mr2
* changes:
Remove references to com.google.android.gtalkservice.xml.
Jeff Hamilton [Wed, 18 Nov 2009 07:39:52 +0000 (23:39 -0800)]
Remove references to com.google.android.gtalkservice.xml.
Raphael [Wed, 18 Nov 2009 05:20:37 +0000 (21:20 -0800)]
Fix the Windows SDK build for the development to sdk split.
Change-Id: Iabeee6aa319a3d98d05357f508b190ba65196df7
Dan Egnor [Wed, 18 Nov 2009 06:00:06 +0000 (22:00 -0800)]
am
573205f4: Remove external/googleclient (the code moved elsewhere)
Merge commit '
573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp
* commit '
573205f4838cf0369fd6a7028c793726d1eb8620':
Remove external/googleclient (the code moved elsewhere)
Dan Egnor [Wed, 18 Nov 2009 05:11:08 +0000 (21:11 -0800)]
Remove external/googleclient (the code moved elsewhere)
Dan Bornstein [Wed, 18 Nov 2009 00:35:22 +0000 (16:35 -0800)]
am
34ce5914: resolved conflicts for merge of
c3d9645e to eclair-mr2
Merge commit '
34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp
* commit '
34ce59147ca68f81a36ab05533a90199147ef3c7':
Add the example test to the CTS.
Dan Bornstein [Wed, 18 Nov 2009 00:27:02 +0000 (16:27 -0800)]
resolved conflicts for merge of
c3d9645e to eclair-mr2
Android (Google) Code Review [Tue, 17 Nov 2009 23:39:46 +0000 (15:39 -0800)]
Merge change I392672f1 into eclair
* changes:
Add the example test to the CTS.
Xavier Ducrohet [Tue, 17 Nov 2009 23:10:41 +0000 (15:10 -0800)]
Change where makefile looks for sdk_clean.sh
Dan Bornstein [Tue, 17 Nov 2009 22:27:40 +0000 (14:27 -0800)]
Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
Adam Bliss [Tue, 17 Nov 2009 04:00:57 +0000 (20:00 -0800)]
am
0774bf3e: am
580cdbe0: Enables nodpi drawables in the framework.
Merge commit '
0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp
* commit '
0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
Enables nodpi drawables in the framework.