Commit Graph

559 Commits

Author SHA1 Message Date
Doug Zongker a660e48ea7 am 4cac8afc: am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '4cac8afc21a356ce3ca074f12383cf1526d44156'

* commit '4cac8afc21a356ce3ca074f12383cf1526d44156':
  include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:33:14 -08:00
Doug Zongker 4cac8afc21 am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt
Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp

* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
  include pre-signed prebuilt .apks in apkcerts.txt
2009-12-14 15:24:22 -08:00
Doug Zongker 714111cbdd include pre-signed prebuilt .apks in apkcerts.txt 2009-12-14 10:14:46 -08:00
Scott Main 1e99d1688e am be4eca18: am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38'

* commit 'be4eca189416ca9578d6d35ae3c7e89ff9e4aa38':
  docs: add "figure" class for DIV elements that contain
2009-12-10 23:41:29 -08:00
Scott Main be4eca1894 am f7b3211e: am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb' into eclair-mr2-plus-aosp

* commit 'f7b3211e089a2b243938f5e3101d40cbdaf8b8bb':
  docs: add "figure" class for DIV elements that contain
2009-12-10 17:52:19 -08:00
Scott Main f7b3211e08 am 1dd6ff63: Merge change I483cf38d into eclair
Merge commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da' into eclair-mr2

* commit '1dd6ff638f14e3c583eaa89d0b7341a3811293da':
  docs: add "figure" class for DIV elements that contain
2009-12-10 17:44:38 -08:00
Doug Zongker 8517366a7a am c9806cfd: am bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
Merge commit 'c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd'

* commit 'c9806cfd31ee660d0fa01c88c42a374c9a9ae8bd':
  remove shared_uid cert check from sign_targt_file_apks
2009-12-10 14:41:49 -08:00
Doug Zongker f928dd7af0 am a492ecce: am fe8ff19a: Merge change Ief993a27 into eclair-mr2
Merge commit 'a492ecce759417b965f93edcc40919866240d581'

* commit 'a492ecce759417b965f93edcc40919866240d581':
  add signing checker script to releasetools
2009-12-10 14:41:20 -08:00
Doug Zongker 0235b4d595 am 23c1f0ca: am 5ae770fc: add option to @hide classes generated from .logtags files
Merge commit '23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5'

* commit '23c1f0ca7d629af4de06fb2b05ee9add2bf0a4d5':
  add option to @hide classes generated from .logtags files
2009-12-10 14:38:10 -08:00
Doug Zongker c9806cfd31 am bbfb96f4: remove shared_uid cert check from sign_targt_file_apks
Merge commit 'bbfb96f46472c74e2dbdd190fb67cdda13347eb4' into eclair-mr2-plus-aosp

* commit 'bbfb96f46472c74e2dbdd190fb67cdda13347eb4':
  remove shared_uid cert check from sign_targt_file_apks
2009-12-10 11:44:09 -08:00
Doug Zongker bbfb96f464 remove shared_uid cert check from sign_targt_file_apks
This check (and others) are now done by the separate script
check_target_files_signatures; the one here is redundant.
2009-12-10 11:22:57 -08:00
Doug Zongker a492ecce75 am fe8ff19a: Merge change Ief993a27 into eclair-mr2
Merge commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea' into eclair-mr2-plus-aosp

* commit 'fe8ff19a2a0698d43868c86b5cead0553bdef8ea':
  add signing checker script to releasetools
2009-12-10 09:42:10 -08:00
Android (Google) Code Review fe8ff19a2a Merge change Ief993a27 into eclair-mr2
* changes:
  add signing checker script to releasetools
2009-12-10 09:37:19 -08:00
Scott Main 483cf38d8d docs: add "figure" class for DIV elements that contain
a figure image with caption text.

needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
2009-12-09 18:08:32 -08:00
Doug Zongker 23c1f0ca7d am 5ae770fc: add option to @hide classes generated from .logtags files
Merge commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2' into eclair-mr2-plus-aosp

* commit '5ae770fc0e43172e1efc5146a38e7d1f452143e2':
  add option to @hide classes generated from .logtags files
2009-12-09 16:01:33 -08:00
Doug Zongker 5ae770fc0e add option to @hide classes generated from .logtags files
Generate a javadoc @hide comment on the class when "option
javadoc_hide true" is specified in the input .logtags file.
2009-12-09 12:31:00 -08:00
Doug Zongker 75f1736469 add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files.  It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
2009-12-09 09:36:41 -08:00
Scott Main e79b9dfc06 am 0be5c863: am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit '0be5c863a204cc37fda35574c3111ac363b26b17'

* commit '0be5c863a204cc37fda35574c3111ac363b26b17':
  docs: add context coloring to code snippets with prettify script
2009-12-08 14:51:26 -08:00
Scott Main 0be5c863a2 am a2496682: am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit 'a2496682f9c6f9311199df7300bb8e16298cf40d' into eclair-mr2-plus-aosp

* commit 'a2496682f9c6f9311199df7300bb8e16298cf40d':
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:39:04 -08:00
Scott Main a2496682f9 am 9b0ad4c7: Merge change I79580117 into eclair
Merge commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e' into eclair-mr2

* commit '9b0ad4c7258b586f1763bc497e8ed33f42ce446e':
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:34:01 -08:00
Android (Google) Code Review 9b0ad4c725 Merge change I79580117 into eclair
* changes:
  docs: add context coloring to code snippets with prettify script
2009-12-07 16:29:47 -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
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
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
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
Scott Main f8af887a06 docs: add context coloring to code snippets with prettify script 2009-12-03 10:52:30 -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 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 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 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
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 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 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 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
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