OSDN Git Service
Jean-Baptiste Queru [Mon, 21 Dec 2009 23:31:49 +0000 (15:31 -0800)]
merge from open-source master
Brett Chabot [Fri, 18 Dec 2009 00:38:04 +0000 (16:38 -0800)]
am
1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '
1e43c510758439b3195597056121c59b71481254' into eclair-plus-aosp
* commit '
1e43c510758439b3195597056121c59b71481254':
Add CTS accounts tests to CTS makefile.
Brett Chabot [Thu, 17 Dec 2009 23:14:40 +0000 (15:14 -0800)]
Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
Scott Main [Thu, 17 Dec 2009 05:40:55 +0000 (21:40 -0800)]
am
99a25fba: Merge change I92c7fe59 into eclair
Merge commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp
* commit '
99a25fbaa50a077c5d62b9ae204677c176534d8b':
docs: change DOCTYPE to html5 format
Android (Google) Code Review [Thu, 17 Dec 2009 05:38:02 +0000 (21:38 -0800)]
Merge change I92c7fe59 into eclair
* changes:
docs: change DOCTYPE to html5 format
Scott Main [Thu, 17 Dec 2009 05:36:15 +0000 (21:36 -0800)]
docs: change DOCTYPE to html5 format
Scott Main [Wed, 16 Dec 2009 23:44:37 +0000 (15:44 -0800)]
am
ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp
* commit '
ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
docs for esr: add support for breadcrumbing in the resource docs
Scott Main [Wed, 16 Dec 2009 23:36:20 +0000 (15:36 -0800)]
docs for esr: add support for breadcrumbing in the resource docs
Dirk Dougherty [Wed, 16 Dec 2009 03:29:52 +0000 (19:29 -0800)]
am
8c627b04: Merge change Ib471b5b2 into eclair
Merge commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1' into eclair-plus-aosp
* commit '
8c627b04898cab723e0df8666a7cc11d5d1c70f1':
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Android (Google) Code Review [Wed, 16 Dec 2009 03:26:48 +0000 (19:26 -0800)]
Merge change Ib471b5b2 into eclair
* changes:
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Dirk Dougherty [Wed, 16 Dec 2009 02:48:38 +0000 (18:48 -0800)]
sdk doc change for esr: Add left nav highlight for interior files in resources tab.
Bug:
2160782
Change-Id: Ib471b5b28f599447e77294c8dcc23d24a18c3436
Xavier Ducrohet [Tue, 15 Dec 2009 18:33:15 +0000 (10:33 -0800)]
am
920f2aae: Add the LiveWallpaper sample as prebuilt to the SDK system image.
Merge commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b' into eclair-plus-aosp
* commit '
920f2aaee64cc21f00d712ba17a1dded02ccff6b':
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Xavier Ducrohet [Tue, 15 Dec 2009 15:42:24 +0000 (07:42 -0800)]
am
fac84b56: Merge change Icb5cf14e into eclair
Merge commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp
* commit '
fac84b561193a62b3e9bc7a50b8948a6356be92c':
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 15:41:17 +0000 (07:41 -0800)]
am
88f254bf: Add gallery to the SDK build now that it\'s split from the Camera app.
Merge commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570' into eclair-plus-aosp
* commit '
88f254bf55b8a78921d94f40e3bcc9c25a348570':
Add gallery to the SDK build now that it's split from the Camera app.
Dirk Dougherty [Tue, 15 Dec 2009 15:38:57 +0000 (07:38 -0800)]
am
502c498f: sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Merge commit '
502c498fec23cb28d16f5e86e981400f76da36ea' into eclair-plus-aosp
* commit '
502c498fec23cb28d16f5e86e981400f76da36ea':
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Xavier Ducrohet [Tue, 15 Dec 2009 06:37:13 +0000 (22:37 -0800)]
Add the LiveWallpaper sample as prebuilt to the SDK system image.
Change-Id: I5a1b0d2e383b757e52879792ee80dbd61f97f9a4
Android (Google) Code Review [Tue, 15 Dec 2009 02:20:10 +0000 (18:20 -0800)]
Merge change Icb5cf14e into eclair
* changes:
Add feature list support to DroidDoc.
Xavier Ducrohet [Tue, 15 Dec 2009 01:55:05 +0000 (17:55 -0800)]
Add feature list support to DroidDoc.
Similarly to intent actions/categories, DroidDoc look
for the FEATURE-type SdkConstant annotation and builds
a list of optional features for the platform.
This is then packaged with the SDK to be used by the
custom editors (manifest editor in this case)
Change-Id: Icb5cf14ebd8251017cd850eacfdbb889219b3697
Xavier Ducrohet [Tue, 15 Dec 2009 00:46:05 +0000 (16:46 -0800)]
Add gallery to the SDK build now that it's split from the Camera app.
Bug:
2275030
Change-Id: Iad74a37d0df1d77185062cb4323665be7185c242
Dirk Dougherty [Thu, 3 Dec 2009 02:01:16 +0000 (18:01 -0800)]
sdk doc change for esr: add "Resources" tab and modify templates to build content for it.
Bug:
2160782
Change-Id: I5c45bdf4861ba2dc150e95d5523367a14b401304
Ravi K Yenduri [Thu, 10 Dec 2009 09:34:19 +0000 (15:04 +0530)]
Enable building for simulator
Scott Main [Thu, 10 Dec 2009 02:17:50 +0000 (18:17 -0800)]
am
1dd6ff63: Merge change I483cf38d into eclair
Merge commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-plus-aosp
* commit '
1dd6ff638f14e3c583eaa89d0b7341a3811293da':
docs: add "figure" class for DIV elements that contain
Android (Google) Code Review [Thu, 10 Dec 2009 02:13:09 +0000 (18:13 -0800)]
Merge change I483cf38d into eclair
* changes:
docs: add "figure" class for DIV elements that contain a figure image with caption text.
Scott Main [Thu, 10 Dec 2009 02:08:32 +0000 (18:08 -0800)]
docs: add "figure" class for DIV elements that contain
a figure image with caption text.
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
Ying Wang [Wed, 9 Dec 2009 22:59:19 +0000 (14:59 -0800)]
am
6ef046c8: Fixes ProGuard options.
Merge commit '
6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp
* commit '
6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
Ying Wang [Tue, 8 Dec 2009 02:14:00 +0000 (18:14 -0800)]
Fixes ProGuard options.
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
Scott Main [Tue, 8 Dec 2009 00:33:18 +0000 (16:33 -0800)]
am
9b0ad4c7: Merge change I79580117 into eclair
Merge commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-plus-aosp
* commit '
9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
docs: add context coloring to code snippets with prettify script
Android (Google) Code Review [Tue, 8 Dec 2009 00:29:47 +0000 (16:29 -0800)]
Merge change I79580117 into eclair
* changes:
docs: add context coloring to code snippets with prettify script
Mike Lockwood [Mon, 7 Dec 2009 15:34:43 +0000 (07:34 -0800)]
am
882ad42e: Add clean step for switching GPS API from pdapi to loc_api
Merge commit '
882ad42e0de35d86f2361867e3efc497002b73e6' into eclair-plus-aosp
* commit '
882ad42e0de35d86f2361867e3efc497002b73e6':
Add clean step for switching GPS API from pdapi to loc_api
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>
Doug Zongker [Fri, 4 Dec 2009 18:41:05 +0000 (10:41 -0800)]
am
e81271f5: Merge change Id97eba9f into eclair
Merge commit '
e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-plus-aosp
* commit '
e81271f526db01af84eabdd99d309c9425d3f1a3':
don't add "ota-rel-keys" tag to build fingerprints
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
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 00:44:47 +0000 (16:44 -0800)]
am
ae91c7f8: Merge change I5ecba70c into eclair
Merge commit '
ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8' into eclair-plus-aosp
* 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 [Thu, 3 Dec 2009 19:50:26 +0000 (11:50 -0800)]
am
35b84b28: Overwrite android-info instead of appending to it
Merge commit '
35b84b287f9cba2d098d28eb0e3b44abd6ae131a' into eclair-plus-aosp
* commit '
35b84b287f9cba2d098d28eb0e3b44abd6ae131a':
Overwrite android-info instead of appending to it
Dan Bornstein [Thu, 3 Dec 2009 19:50:21 +0000 (11:50 -0800)]
am
0706e6a4: Merge change I485df382 into eclair
Merge commit '
0706e6a4a3e6b80c11aae1648a3876c59929c48f' into eclair-plus-aosp
* 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.
Scott Main [Thu, 3 Dec 2009 04:59:40 +0000 (20:59 -0800)]
docs: add context coloring to code snippets with prettify script
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 [Tue, 1 Dec 2009 00:00:07 +0000 (16:00 -0800)]
am
8bec09ee: add \'extras\' mechanism to OTA and signing tools
Merge commit '
8bec09ee7264160e4e08973a0efcc6bd2c898925' into eclair-plus-aosp
* commit '
8bec09ee7264160e4e08973a0efcc6bd2c898925':
add 'extras' mechanism to OTA and signing tools
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:27:40 +0000 (14:27 -0800)]
am
2b80317b: only auto-generate board= requirement if a board-info file is not specified
Merge commit '
2b80317be27e5450d7212b10777992d782dcf90e' into eclair-plus-aosp
* 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
Mathias Agopian [Tue, 24 Nov 2009 22:47:19 +0000 (14:47 -0800)]
am
636458dd: clean step for build.prop
Merge commit '
636458dd0665f4cca1a208f054a891a97d3fa8de' into eclair-plus-aosp
* commit '
636458dd0665f4cca1a208f054a891a97d3fa8de':
clean step for build.prop
Mathias Agopian [Tue, 24 Nov 2009 07:14:44 +0000 (23:14 -0800)]
clean step for build.prop
Scott Main [Mon, 23 Nov 2009 21:06:10 +0000 (13:06 -0800)]
am
0086ab50: am
1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '
0086ab50631cfc6abb0f591871f5bb5da74e4606' into eclair-plus-aosp
* 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:42:44 +0000 (16:42 -0800)]
am
c3467e43: am
4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '
c3467e43febbc39cbb43afe25dd988641e2f0218' into eclair-plus-aosp
* 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:03:32 +0000 (16:03 -0800)]
am
bb0c8804: Add Bluetooth to the test list.
Merge commit '
bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-plus-aosp
* 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 17:59:25 +0000 (09:59 -0800)]
am
c00b2cf9: am
91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '
c00b2cf9c606cbdb2a5e9f871d3fc23962af78cd' into eclair-plus-aosp
* 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:28:26 +0000 (11:28 -0800)]
am
aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit '
aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d' into eclair-plus-aosp
* commit '
aefcbfcf6ebdb4ac44ff338d577d67bfdee2249d':
sdk doc change for esr: update version refs to 2.0.1.
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.
Dan Bornstein [Thu, 19 Nov 2009 18:47:33 +0000 (10:47 -0800)]
am
ffbe862d: Merge change I60b2633b into eclair
Merge commit '
ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-plus-aosp
* commit '
ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
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
Dianne Hackborn [Thu, 19 Nov 2009 02:21:31 +0000 (18:21 -0800)]
am
90b35770: Merge change If922a88c into eclair
Merge commit '
90b35770c227f9b4ad56194de627593496acf724' into eclair-plus-aosp
* commit '
90b35770c227f9b4ad56194de627593496acf724':
Update version name to 2.1 and API to 7.
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.
Raphael [Thu, 19 Nov 2009 01:47:57 +0000 (17:47 -0800)]
am
81d88c31: am
d920ec83: Fix a Windows-only discrepency in the Windows SDK build.
Merge commit '
81d88c31be80493886e6844ebf8af8a03273208c' into eclair-plus-aosp
* commit '
81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
Raphael [Thu, 19 Nov 2009 01:47:54 +0000 (17:47 -0800)]
am
f15e028f: am
a62a4421: Fix the Windows SDK build for the development to sdk split.
Merge commit '
f15e028fe822069e44b0e06fa91f537048538f94' into eclair-plus-aosp
* commit '
f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
Xavier Ducrohet [Thu, 19 Nov 2009 01:47:50 +0000 (17:47 -0800)]
am
258b2b45: am
1ae98804: Change where makefile looks for sdk_clean.sh
Merge commit '
258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-plus-aosp
* commit '
258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
Scott Main [Thu, 19 Nov 2009 01:47:46 +0000 (17:47 -0800)]
am
ec9baf22: am
9a5c8402: docs: make all javadoc reference links use <code> and remove some unused CSS
Merge commit '
ec9baf22a959af85f77f56360e95a738f360c4f0' into eclair-plus-aosp
* commit '
ec9baf22a959af85f77f56360e95a738f360c4f0':
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
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>
Brett Chabot [Wed, 18 Nov 2009 22:46:42 +0000 (14:46 -0800)]
am
2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Merge commit '
2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-plus-aosp
* 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
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 Bornstein [Tue, 17 Nov 2009 23:42:56 +0000 (15:42 -0800)]
am
c3d9645e: Merge change I392672f1 into eclair
Merge commit '
c3d9645e29aeb124b39a0b7639767a5f1fead229' into eclair-plus-aosp
* commit '
c3d9645e29aeb124b39a0b7639767a5f1fead229':
Add the example test to the CTS.
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 02:59:04 +0000 (18:59 -0800)]
am
580cdbe0: Enables nodpi drawables in the framework.
Merge commit '
580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-plus-aosp
* commit '
580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
Adam Bliss [Tue, 17 Nov 2009 01:18:40 +0000 (17:18 -0800)]
Enables nodpi drawables in the framework.
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:05:55 +0000 (14:05 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:05:33 +0000 (12:05 -0800)]
merge from eclair
Christopher Tate [Fri, 13 Nov 2009 17:08:30 +0000 (09:08 -0800)]
am
eb71bf7b: Merge change I01d9d733 into eclair
Merge commit '
eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-plus-aosp
* commit '
eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
Add a host shell function to generate system_server stack traces
Dianne Hackborn [Fri, 13 Nov 2009 17:08:26 +0000 (09:08 -0800)]
am
d0b22902: Merge change I847e8ab8 into eclair
Merge commit '
d0b229025792977fe668cd636c7875d954b80b82' into eclair-plus-aosp
* commit '
d0b229025792977fe668cd636c7875d954b80b82':
Fix issue #
2258571: Fix build versions
Xavier Ducrohet [Fri, 13 Nov 2009 17:08:22 +0000 (09:08 -0800)]
am
c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit '
c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-plus-aosp
* commit '
c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
Add the sdk overlay to the build.
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:45:15 +0000 (18:45 -0800)]
eclair snapshot
Android (Google) Code Review [Fri, 13 Nov 2009 00:46:35 +0000 (16:46 -0800)]
Merge change I01d9d733 into eclair
* changes:
Add a host shell function to generate system_server stack traces
Android (Google) Code Review [Fri, 13 Nov 2009 00:28:03 +0000 (16:28 -0800)]
Merge change I847e8ab8 into eclair
* changes:
Fix issue #
2258571: Fix build versions
Android (Google) Code Review [Fri, 13 Nov 2009 00:20:00 +0000 (16:20 -0800)]
Merge change I4d3d08a1 into eclair
* changes:
Add the sdk overlay to the build.
Dianne Hackborn [Thu, 12 Nov 2009 23:35:35 +0000 (15:35 -0800)]
Fix issue #
2258571: Fix build versions
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
Christopher Tate [Thu, 12 Nov 2009 23:33:08 +0000 (15:33 -0800)]
Add a host shell function to generate system_server stack traces
For debugging non-ANR weird states in the system server, it is incredibly handy
to be able to force a complete thread-stack dump of that process. Here's a
shell function that does so (creating the /data/anr/traces.txt file with the
usual permissions if it does not yet exist).
Depends on adb having been configured to run as root.
Change-Id: I01d9d733ef08ffefb00cb61968df36ecf62087f0
David 'Digit' Turner [Thu, 12 Nov 2009 02:13:01 +0000 (18:13 -0800)]
am
31597999: Merge change I2edfb71d into eclair
Merge commit '
31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp
* commit '
31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Android (Google) Code Review [Thu, 12 Nov 2009 02:08:03 +0000 (18:08 -0800)]
Merge change I2edfb71d into eclair
* changes:
Support secondary CPU ABI in build.prop
OSDN Git Service
