Commit Graph

1081 Commits

Author SHA1 Message Date
Android (Google) Code Review 9bc88726cb Merge change I45302ff0 into eclair-mr2
* changes:
  make prebuilt .apks require LOCAL_CERTIFICATE
2009-12-11 14:50:33 -08:00
Doug Zongker 45302ff00b make prebuilt .apks require LOCAL_CERTIFICATE
Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
2009-12-11 13:50:35 -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
Ying Wang 92e2d3e206 am 6ef046c8: Fixes ProGuard options.
Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-mr2

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.
2009-12-10 17:39:53 -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
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
Android (Google) Code Review 1dd6ff638f Merge change I483cf38d into eclair
* changes:
  docs: add "figure" class for DIV elements that contain a figure image with caption text.
2009-12-09 18:13:09 -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
Ying Wang 6ef046c893 Fixes ProGuard options.
1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
2009-12-09 14:31:22 -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
Jean-Baptiste Queru 3a59b2ceb9 Remove Google-specific files
Also remove unused configuration
2009-12-08 15:11:04 -08:00
Jean-Baptiste Queru 6254132a3e remove old p4->git import history 2009-12-08 14:02:18 -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
Mike Lockwood 623a5572e8 resolved conflicts for merge of 882ad42e to eclair-mr2
Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
2009-12-07 10:52:22 -05:00
Mike Lockwood 882ad42e0d Add clean step for switching GPS API from pdapi to loc_api
Change-Id: Ifa75b0865b547f5e643a4466f13ec7485e902e5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-07 07:23:25 -05: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 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
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
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
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 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 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
Scott Main f8af887a06 docs: add context coloring to code snippets with prettify script 2009-12-03 10:52:30 -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 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 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 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 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 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 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