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

2223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
c1e184f39c ERD65 2009-12-04 09:24:25 -08:00
The Android Automerger
c3da0ed5dd Merge branch 'eclair' into eclair-release 2009-12-04 09:24:04 -08:00
Doug Zongker
0d5eb0b7e4 am af830d39: am 485847e4: Merge change I6f85805b into eclair-mr2 
Merge commit 'af830d3999ac1670b92207f6c1201d297913b9a9'

* commit 'af830d3999ac1670b92207f6c1201d297913b9a9':
  break up event-log-tags; generate java source files with constants
 2009-12-04 04:31:16 -08:00
Doug Zongker
5705a6bebf am 2f07ff1d: am e4ea0ab8: am ae91c7f8: Merge change I5ecba70c into eclair 
Merge commit '2f07ff1d4b0e1772c03dc7d12fb113759e58e18b'

* commit '2f07ff1d4b0e1772c03dc7d12fb113759e58e18b':
  add missing comma
 2009-12-04 04:31:06 -08:00
Ying Wang
3fd62d5921 am 80eaaa0c: am cc674300: am 35b84b28: Overwrite android-info instead of appending to it 
Merge commit '80eaaa0c280daf7123241966223608bab40d236f'

* commit '80eaaa0c280daf7123241966223608bab40d236f':
  Overwrite android-info instead of appending to it
 2009-12-04 04:31:01 -08:00
Dan Bornstein
4dc97dcb7d am 6082332e: am dc04cc89: am 0706e6a4: Merge change I485df382 into eclair 
Merge commit '6082332e4edc66d6e41856969ac8d1c534928541'

* commit '6082332e4edc66d6e41856969ac8d1c534928541':
  Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
 2009-12-04 04:30:57 -08:00
Dianne Hackborn
176c758cb4 Change version to MR2 development. 2009-12-03 18:19:53 -08:00
Doug Zongker
d97eba9f39 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.
 2009-12-03 17:38:11 -08:00
Doug Zongker
af830d3999 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
 2009-12-03 17:05:52 -08:00
Android (Google) Code Review
485847e4c4 Merge change I6f85805b into eclair-mr2 
* changes:
  break up event-log-tags; generate java source files with constants
 2009-12-03 16:58:40 -08:00
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
9bd4962af8 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.
 2009-12-03 16:47:52 -08:00
Doug Zongker
a94dc8097c am ae91c7f8: Merge change I5ecba70c into eclair 
Merge commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8' into eclair-plus-aosp

* commit 'ae91c7f8d1962e7c0ba7aa0d57453fe359e2e2d8':
  add missing comma
 2009-12-03 16:44:47 -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
The Android Automerger
1b6ba62e11 ERD64B 2009-12-03 13:41:43 -08:00
The Android Automerger
261ab81d02 Merge branch 'eclair' into eclair-release 2009-12-03 13:41:22 -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
d56db9fd78 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
 2009-12-03 11:50:26 -08:00
Dan Bornstein
14f4dec256 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.
 2009-12-03 11:50:21 -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
Scott Main
f8af887a06 docs: add context coloring to code snippets with prettify script 2009-12-03 10:52:30 -08:00
The Android Automerger
a19fa9a6dd ERD64 2009-12-03 09:17:38 -08:00
android-build SharedAccount
676960c8b5 ERD63C 2009-12-02 17:41:25 -08:00
android-build SharedAccount
b32b204a91 ERD63B 2009-12-02 16:55:41 -08:00
The Android Automerger
2f5f660976 ERD63 2009-12-02 08:50:08 -08:00
The Android Automerger
b94f8c8930 Merge branch 'eclair' into eclair-release 2009-12-02 08:49:46 -08:00
Doug Zongker
114b6d7e0e am db8e83ec: am d816500c: am 8bec09ee: add \'extras\' mechanism to OTA and signing tools 
Merge commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158'

* commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158':
  add 'extras' mechanism to OTA and signing tools
 2009-12-01 17:38:18 -08:00
Doug Zongker
bfbf0e0cd1 am 34a85012: am 9b3c88e1: remove mkkey.sh from build 
Merge commit '34a85012bf0d300d6c2d1e02a3540fc57d410004'

* commit '34a85012bf0d300d6c2d1e02a3540fc57d410004':
  remove mkkey.sh from build
 2009-12-01 17:38:15 -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
android-build SharedAccount
44adfec03c move branch back to ERD62 2009-12-01 15:47:03 -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-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
0526b1b465 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
 2009-11-30 16:00:07 -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
9d4bf1e88d am 600b4bb6: am 8c1eeffe: am 2b80317b: only auto-generate board= requirement if a board-info file is not specified 
Merge commit '600b4bb655e96655b769f390a17a85ad20fc15a5'

* commit '600b4bb655e96655b769f390a17a85ad20fc15a5':
  only auto-generate board= requirement if a board-info file is not specified
 2009-11-25 14:36:16 -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
39710c9b08 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
 2009-11-25 14:27:40 -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