StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,297 Commits 1 Branch 0 Tags
2f07ff1d4b0e1772c03dc7d12fb113759e58e18b
Commit Graph

1297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Zongker
2f07ff1d4b am e4ea0ab8: am ae91c7f8: Merge change I5ecba70c into eclair 
Merge commit 'e4ea0ab8bd1ceef94399ac028e4fed1c18333b98' into eclair-mr2-plus-aosp

* commit 'e4ea0ab8bd1ceef94399ac028e4fed1c18333b98':
  add missing comma
 2009-12-03 16:57:45 -08:00
Doug Zongker
e4ea0ab8bd am ae91c7f8: Merge change I5ecba70c into eclair 
Merge commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8' into eclair-mr2

* commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8':
  add missing comma
 2009-12-03 16:43:37 -08:00
Android (Google) Code Review
ae91c7f8d1 Merge change I5ecba70c into eclair 
* changes:
  add missing comma
 2009-12-03 16:38:44 -08:00
Doug Zongker
5ecba70ce5 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).
 2009-12-03 16:36:20 -08:00
Ying Wang
80eaaa0c28 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
 2009-12-03 16:34:23 -08:00
Dan Bornstein
6082332e4e 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.
 2009-12-03 16:34:20 -08:00
Ying Wang
cc6743007c 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
 2009-12-03 11:50:32 -08:00
Dan Bornstein
dc04cc892a 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.
 2009-12-03 11:50:27 -08:00
Ying Wang
35b84b287f 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.
 2009-12-03 11:25:47 -08:00
Doug Zongker
db8e83ecee 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
 2009-12-01 17:30:37 -08:00
Doug Zongker
34a85012bf am 9b3c88e1: remove mkkey.sh from build 
Merge commit '9b3c88e19fb29ba3227f32fbf58fec4516ec9855' into eclair-mr2-plus-aosp

* commit '9b3c88e19fb29ba3227f32fbf58fec4516ec9855':
  remove mkkey.sh from build
 2009-12-01 17:30:34 -08:00
Doug Zongker
d816500cdd 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
 2009-12-01 17:14:51 -08:00
Doug Zongker
9b3c88e19f remove mkkey.sh from build 
Update README with instructions on using the new make_key script
instead.
 2009-12-01 12:42:30 -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
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
Brian Swetland
600b4bb655 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
 2009-11-25 14:31:12 -08:00
Brian Swetland
8c1eeffe43 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
 2009-11-25 14:27:20 -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
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
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
636458dd06 clean step for build.prop 2009-11-23 23:14:44 -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
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
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
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
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
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
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
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
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
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
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
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
Dianne Hackborn
26ab7084b5 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.
 2009-11-19 11:02:49 -08:00
Dianne Hackborn
07e1232a2d resolved conflicts for merge of 90b35770 to eclair-mr2 2009-11-19 10:57:12 -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
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