Commit Graph

2223 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
c321435a96 am d7fbf48c: am 69ed23d0: resolved conflicts for merge of 636458dd to eclair-mr2
Merge commit 'd7fbf48cea08316ab0fe2be18c950f3cb4158bbc'

* commit 'd7fbf48cea08316ab0fe2be18c950f3cb4158bbc':
  clean step for build.prop
2009-11-24 15:09:53 -08:00
Jean-Baptiste Queru
d7fbf48cea 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
2009-11-24 15:04:26 -08:00
Jean-Baptiste Queru
69ed23d097 resolved conflicts for merge of 636458dd to eclair-mr2 2009-11-24 14:58:54 -08:00
Mathias Agopian
2041eaa9c9 am 636458dd: clean step for build.prop
Merge commit '636458dd0665f4cca1a208f054a891a97d3fa8de' into eclair-plus-aosp

* commit '636458dd0665f4cca1a208f054a891a97d3fa8de':
  clean step for build.prop
2009-11-24 14:47:19 -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
Dan Egnor
b38a9f2be6 am b72e28f9: 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 'b72e28f991b21535bfcb2ed59ead6ea9a318181c'

* commit 'b72e28f991b21535bfcb2ed59ead6ea9a318181c':
  Add cleanspec to remove an old, historical package which
2009-11-23 16:49:01 -08:00
Dan Egnor
b72e28f991 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
2009-11-23 16:45:04 -08:00
Dan Egnor
7e39fc2351 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.
2009-11-23 16:35:33 -08:00
Scott Main
f7161130f0 am 33c5806e: am 3bfb5192: am 0086ab50: am 1a177879: Merge change I06c40454 into eclair-sdk
Merge commit '33c5806e3e19ed95eca664b4798c1e819fbaade7'

* commit '33c5806e3e19ed95eca664b4798c1e819fbaade7':
  droiddoc change: revise the sample code generating script so that
2009-11-23 13:16:02 -08:00
Scott Main
33c5806e3e 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
2009-11-23 13:10:35 -08:00
Scott Main
3bfb5192cb 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
2009-11-23 13:06:55 -08:00
Scott Main
7f927afdd6 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
2009-11-23 13:06:10 -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
431e43d655 am 31493fc3: am ff17131e: am c3467e43: am 4cdb7149: docs: change the ADP image for the homepage carousel
Merge commit '31493fc3a0f8ff736b07033fc46dc2d60089a450'

* commit '31493fc3a0f8ff736b07033fc46dc2d60089a450':
  docs: change the ADP image for the homepage carousel
2009-11-20 16:51:31 -08:00
Scott Main
31493fc3a0 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
2009-11-20 16:47:22 -08:00
Scott Main
ff17131e6c 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
2009-11-20 16:42:55 -08:00
Scott Main
41225c49b9 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
2009-11-20 16:42:44 -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
Dan Bornstein
679aa653fc am 92a71f46: am aa71af7f: am bb0c8804: Add Bluetooth to the test list.
Merge commit '92a71f465fa02de5a5e6ed9ba84d2f1dd62e2c78'

* commit '92a71f465fa02de5a5e6ed9ba84d2f1dd62e2c78':
  Add Bluetooth to the test list.
2009-11-20 16:12:06 -08:00
Dan Bornstein
92a71f465f 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.
2009-11-20 16:07:29 -08:00
Dan Bornstein
fced1d6d97 am bb0c8804: Add Bluetooth to the test list.
Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-plus-aosp

* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
  Add Bluetooth to the test list.
2009-11-20 16:03:32 -08:00
Dan Bornstein
aa71af7f8e am bb0c8804: Add Bluetooth to the test list.
Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-mr2

* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
  Add Bluetooth to the test list.
2009-11-20 16:03:22 -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
f8d8feb884 am 5a5631f5: am 7bcb88ff: am c00b2cf9: am 91ed9bbb: Merge change Id8115ffb into eclair-sdk
Merge commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d'

* commit '5a5631f5c06e2ce8087f0c0668d21f4b6361125d':
  docs: revise user agent detection to use lower case
2009-11-20 10:08:53 -08:00
Scott Main
5a5631f5c0 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
2009-11-20 10:04:01 -08:00
Scott Main
7bcb88ff08 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
2009-11-20 09:59:46 -08:00
Scott Main
e31f151464 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
2009-11-20 09:59:25 -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
Dirk Dougherty
7d729b7512 am f94ea5eb: am 952ea818: am aefcbfcf: Merge change Ib5817a3a into eclair
Merge commit 'f94ea5ebe4f26db253d9e6f6baee485f378e6344'

* commit 'f94ea5ebe4f26db253d9e6f6baee485f378e6344':
  sdk doc change for esr: update version refs to 2.0.1.
2009-11-19 17:39:01 -08:00
Dan Bornstein
3f7669520f am 33f188de: am d867551e: am ffbe862d: Merge change I60b2633b into eclair
Merge commit '33f188de6c656d4056b1f98f37c4b8ca63c7d493'

* commit '33f188de6c656d4056b1f98f37c4b8ca63c7d493':
  Add the JNI test to the CTS list.
2009-11-19 17:38:57 -08:00
Dirk Dougherty
f94ea5ebe4 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.
2009-11-19 11:48:16 -08:00
Dan Bornstein
33f188de6c 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.
2009-11-19 11:48:13 -08:00
Dirk Dougherty
952ea81886 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.
2009-11-19 11:42:29 -08:00
Dan Bornstein
d867551efe am ffbe862d: Merge change I60b2633b into eclair
Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-mr2

* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
  Add the JNI test to the CTS list.
2009-11-19 11:41:59 -08:00