Commit graph

1493 commits

Author SHA1 Message Date
Bjorn Bringert
b3be6d72a1 am fe8ab167: am e15968b4: Clean step for the move of SearchableInfo to android.app
Merge commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327'

* commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327':
  Clean step for the move of SearchableInfo to android.app
2009-12-07 14:58:53 -08:00
Doug Zongker
8c704cc750 am e1f8ec91: am 56a01cbb: am e81271f5: Merge change Id97eba9f into eclair
Merge commit 'e1f8ec918e5e257feb0f6d1fcdf984ec7e591830'

* commit 'e1f8ec918e5e257feb0f6d1fcdf984ec7e591830':
  don't add "ota-rel-keys" tag to build fingerprints
2009-12-07 14:58:50 -08:00
Bjorn Bringert
fe8ab167ca am e15968b4: Clean step for the move of SearchableInfo to android.app
Merge commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0' into eclair-mr2-plus-aosp

* commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0':
  Clean step for the move of SearchableInfo to android.app
2009-12-05 12:38:22 -08:00
Doug Zongker
e1f8ec918e am 56a01cbb: am e81271f5: Merge change Id97eba9f into eclair
Merge commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a' into eclair-mr2-plus-aosp

* commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a':
  don't add "ota-rel-keys" tag to build fingerprints
2009-12-05 12:38:19 -08:00
Bjorn Bringert
e15968b47a Clean step for the move of SearchableInfo to android.app
This is part of http://b/issue?id=2270838

Change-Id: I4f70549f0a15e5c90fa5297a2af9f872bb5312a1
2009-12-05 18:24:52 +00:00
Doug Zongker
6c5a1ceed9 am 95137c3d: am 6c4a70c6: Merge change I672b05c4 into eclair-mr2
Merge commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e'

* commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e':
  make build depend on event-log-tags file
2009-12-04 10:43:36 -08:00
Dianne Hackborn
fef125ec59 am af5cb904: am 176c758c: Change version to MR2 development.
Merge commit 'af5cb9042497509fb75060667f5ca921c10218a6'

* commit 'af5cb9042497509fb75060667f5ca921c10218a6':
  Change version to MR2 development.
2009-12-04 10:41:00 -08:00
Doug Zongker
56a01cbb5c am e81271f5: Merge change Id97eba9f into eclair
Merge commit 'e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-mr2

* commit 'e81271f526db01af84eabdd99d309c9425d3f1a3':
  don't add "ota-rel-keys" tag to build fingerprints
2009-12-04 10:40:59 -08:00
Doug Zongker
95137c3dfe am 6c4a70c6: Merge change I672b05c4 into eclair-mr2
Merge commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp

* commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944':
  make build depend on event-log-tags file
2009-12-04 10:40:39 -08:00
Dianne Hackborn
af5cb90424 am 176c758c: Change version to MR2 development.
Merge commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp

* commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
  Change version to MR2 development.
2009-12-04 10:37:09 -08:00
Android (Google) Code Review
e81271f526 Merge change Id97eba9f into eclair
* changes:
  don't add "ota-rel-keys" tag to build fingerprints
2009-12-04 10:36:44 -08:00
Android (Google) Code Review
6c4a70c64d Merge change I672b05c4 into eclair-mr2
* changes:
  make build depend on event-log-tags file
2009-12-04 10:36:31 -08:00
Doug Zongker
672b05c47c make build depend on event-log-tags file
Oops, I forgot to make the build actually require the event-log-tags file.
2009-12-04 10:05:20 -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
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
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
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
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
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
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
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