Commit Graph

1231 Commits

Author SHA1 Message Date
The Android Automerger
b94f8c8930 Merge branch 'eclair' into eclair-release 2009-12-02 08:49:46 -08:00
android-build SharedAccount
44adfec03c move branch back to ERD62 2009-12-01 15:47:03 -08:00
android-build SharedAccount
b3b704cdf6 ERC56C 2009-12-01 12:28:08 -08:00
Android (Google) Code Review
0706e6a4a3 Merge change I485df382 into eclair
* changes:
  Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
2009-12-01 12:26:41 -08:00
The Android Automerger
e6651747d0 ERD62 2009-12-01 09:06:52 -08:00
The Android Automerger
6ae4f9bb05 Merge branch 'eclair' into eclair-release 2009-12-01 09:06:17 -08:00
Doug Zongker
8bec09ee72 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.
2009-11-30 15:37:14 -08:00
The Android Automerger
571855fc07 ERD61 2009-11-30 08:59:47 -08:00
The Android Automerger
ae9e19b5a7 Merge branch 'eclair' into eclair-release 2009-11-30 08:39:12 -08:00
Brian Swetland
c077b7ccc2 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.
2009-11-25 14:25:47 -08:00
android-build SharedAccount
f8c60fc545 ERD56B 2009-11-25 13:50:30 -08:00
Brian Swetland
2b80317be2 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.
2009-11-25 13:43:25 -08:00
android-build SharedAccount
29c11c5c0f ERD56 2009-11-25 12:34:40 -08:00
Dan Bornstein
d0b274d962 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
2009-11-24 15:48:50 -08:00
android-build SharedAccount
131beb9ce3 ERD55B 2009-11-24 15:26:01 -08:00
The Android Automerger
651ae8571d ERD55 2009-11-24 09:29:38 -08:00
The Android Automerger
ef9dcbcec9 Merge branch 'eclair' into eclair-release 2009-11-24 09:29:05 -08:00
Mathias Agopian
636458dd06 clean step for build.prop 2009-11-23 23:14:44 -08:00
Scott Main
0086ab5063 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
2009-11-23 13:02:17 -08:00
Android (Google) Code Review
1a17787928 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).
2009-11-23 12:55:36 -08:00
The Android Automerger
714c3f5b38 ERD54 2009-11-23 09:29:31 -08:00
The Android Automerger
06ba5a6f10 Merge branch 'eclair' into eclair-release 2009-11-23 09:28:46 -08:00
Scott Main
c3467e43fe 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
2009-11-20 16:38:47 -08:00
Scott Main
4cdb714912 docs: change the ADP image for the homepage carousel
Change-Id: I6141f32e18918d51d72cfa645f0ceea709002cc6
2009-11-20 16:22:14 -08:00
The Android Automerger
4c0f7ded71 ERD51 2009-11-20 15:02:37 -08:00
The Android Automerger
e1b3f486d8 Merge branch 'eclair' into eclair-release 2009-11-20 15:02:06 -08:00
Dan Bornstein
bb0c8804dd Add Bluetooth to the test list.
Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
2009-11-20 13:13:41 -08:00
Scott Main
2fa99f1dd6 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
2009-11-20 10:41:49 -08:00
Scott Main
c00b2cf9c6 am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961' into eclair

* commit '91ed9bbbdce1990782b4ac86650f9c79bb94d961':
  docs: revise user agent detection to use lower case
2009-11-20 09:55:08 -08:00
Android (Google) Code Review
91ed9bbbdc 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
2009-11-20 09:38:18 -08:00
Android (Google) Code Review
aefcbfcf6e Merge change Ib5817a3a into eclair
* changes:
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 11:24:29 -08:00
Android (Google) Code Review
ffbe862d05 Merge change I60b2633b into eclair
* changes:
  Add the JNI test to the CTS list.
2009-11-19 10:43:07 -08:00
The Android Automerger
7555c2714e ERD50 2009-11-19 10:23:44 -08:00
The Android Automerger
30e0de5c9f Merge branch 'eclair' into eclair-release 2009-11-19 10:23:01 -08:00
Dirk Dougherty
b5817a3a93 sdk doc change for esr: update version refs to 2.0.1.
Bug: 2160782
2009-11-18 23:15:13 -08:00
Android (Google) Code Review
90b35770c2 Merge change If922a88c into eclair
* changes:
  Update version name to 2.1 and API to 7.
2009-11-18 18:17:46 -08:00
Dianne Hackborn
c3e17966b5 Update version name to 2.1 and API to 7.
Change-Id: If922a88c1f3e99553ec5df9b870713eab1c53c54
2009-11-18 17:40:17 -08:00
Dan Bornstein
01833fba3b Add the JNI test to the CTS list.
Change-Id: I60b2633b98ccb06551e521ff229ed12c897cc2e6
2009-11-18 17:27:10 -08:00
Raphael
81d88c31be 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.
2009-11-18 17:12:39 -08:00
Raphael
f15e028fe8 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.
2009-11-18 17:11:57 -08:00
Xavier Ducrohet
258b2b4504 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
2009-11-18 17:11:53 -08:00
Scott Main
ec9baf22a9 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>
2009-11-18 17:11:50 -08:00
Brett Chabot
2779fa7d9f Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
Bug 2099347

Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
2009-11-18 14:40:54 -08:00
Raphael
d920ec8354 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
2009-11-18 14:16:04 -08:00
The Android Automerger
a2a6b2571b ERD49 2009-11-18 08:49:45 -08:00
The Android Automerger
59e6d55d19 Merge branch 'eclair' into eclair-release 2009-11-18 08:48:12 -08:00
Raphael
a62a442129 Fix the Windows SDK build for the development to sdk split.
Change-Id: Iabeee6aa319a3d98d05357f508b190ba65196df7
2009-11-17 22:12:33 -08:00
Android (Google) Code Review
c3d9645e29 Merge change I392672f1 into eclair
* changes:
  Add the example test to the CTS.
2009-11-17 15:39:46 -08:00
Xavier Ducrohet
1ae9880407 Change where makefile looks for sdk_clean.sh 2009-11-17 15:10:41 -08:00
Dan Bornstein
1347f92e3a Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
2009-11-17 14:27:40 -08:00