Doug Zongker
e05628cc8d
fix signing user builds
...
When unzipping a target-files which has been signed with OTA key
replacement, you'll get "overwrite this file?" prompts because the key
files appear in the zip files twice. Suppress these prompts.
Many developer phone products don't define PRODUCT_OTA_PUBLIC_KEYS, so
add a default key.
This change doesn't affect device code.
2009-08-20 18:02:47 -07:00
Dirk Dougherty
724735d2be
am 6f7ba2dc
: Merge change 20234 into donut
...
Merge commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair
* commit '6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
Remove extraneous quotation mark in template file
2009-08-20 10:36:47 -07:00
Android (Google) Code Review
6f7ba2dce2
Merge change 20234 into donut
...
* changes:
Remove extraneous quotation mark in template file
2009-08-20 10:33:11 -07:00
Andrei Popescu
fb71fe7126
Clean libwebcore after new WebKit merge
2009-08-20 12:42:30 +01:00
Phil Dubach
5e3ab04d97
CTS: Enable Python description/plan generator
...
This enables the new description/plan generator added in change
21366.
2009-08-19 17:03:21 -07:00
Android (Google) Code Review
a3f7c20f90
Merge change 21912 into eclair
...
* changes:
Bump platform version to 4.
2009-08-19 14:46:27 -07:00
Raphael
28fcfdd7dd
Fix broken server Windows SDK build.
...
I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
2009-08-19 14:06:33 -07:00
Android (Google) Code Review
c798114c04
Merge change 21783 into eclair
...
* changes:
Windows: Fix platform build.
2009-08-19 12:11:38 -07:00
Raphael
f6ff4c5acf
Windows: Fix platform build.
2009-08-19 11:32:15 -07:00
Scott Main
f036631b02
am 54161d14
: DOCS ONLY. styleheet changes to fix some errors in the print layout and remove extra space from above nested lists, so they fit closer to the parent list item.
...
Merge commit '54161d143931c5be2d49e8f9f215ec8bff2237af' into eclair
* commit '54161d143931c5be2d49e8f9f215ec8bff2237af':
DOCS ONLY.
2009-08-19 11:05:04 -07:00
Dianne Hackborn
e34fdc0113
Bump platform version to 4.
...
Not sure why this didn't get integrated from Donut.
2009-08-19 11:00:21 -07:00
Chih-Chung Chang
0db6f1ed39
Need this to update system properties (for change 21876).
2009-08-19 18:14:23 +08:00
Scott Main
54161d1439
DOCS ONLY.
...
styleheet changes to fix some errors in the print layout
and remove extra space from above nested lists, so they fit
closer to the parent list item.
2009-08-18 19:00:11 -07:00
Doug Zongker
badd2ca451
fix endianness problem with the tail of the signature comment
...
The two 0xff bytes were intended to easily distinguish files with
whole file signatures from those without, but I got the endianness
backwards. Go ahead and fix that, as long as I'm making changes to
the verifier anyway.
Check for a signature that includes the sequence 0x50 0x4b 0x05 0x06,
which looks to minzip like the start of the EOCD block.
2009-08-14 17:15:46 -07:00
Doug Zongker
09cf56001a
explicitly set max heap size when running signapk
...
On the mac, -Xmx defaults to 64MB, which isn't enough to do a
whole-file signing of a full OTA package.
2009-08-14 15:25:06 -07:00
Doug Zongker
951495fc48
update OTA package maker to do whole-file signature
...
Use the new -w flag to SignApk when signing OTA packages.
2009-08-14 14:07:15 -07:00
Doug Zongker
c6cf01a117
add whole-file signature mode to SignApk
...
Make SignApk generate a signature for (nearly) the entire zip file
when run with the -w option. The signature covers all of the zip file
except for the archive comment (conveniently the last thing in a zip
file); the archive comment field is used to contain the signature
itself.
2009-08-14 12:25:05 -07:00
Android (Google) Code Review
9af298ec82
Merge change 21127
...
* changes:
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
2009-08-13 12:03:57 -07:00
Marco Nelissen
7f0a18f771
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
2009-08-13 11:13:21 -07:00
Sriram Raman
f0061880be
am fab87998
: (-s ours) Fix the platform version (1.6 now) and sdk version (4)
...
Merge commit 'fab87998b50c997ba4e506a080d01f606615eb19'
* commit 'fab87998b50c997ba4e506a080d01f606615eb19':
Fix the platform version (1.6 now) and sdk version (4)
2009-08-12 19:44:20 -07:00
Sriram Raman
8d745304ad
am 5b5f82b6
: (-s ours) Merge change 21000 into donut
...
Merge commit '5b5f82b635697159aeca23ceb0ec9d692c5a04f0'
* commit '5b5f82b635697159aeca23ceb0ec9d692c5a04f0':
Update the platform-version-codename
2009-08-12 19:44:18 -07:00
Sriram Raman
fab87998b5
Fix the platform version (1.6 now) and sdk version (4)
2009-08-12 16:02:12 -07:00
Android (Google) Code Review
5b5f82b635
Merge change 21000 into donut
...
* changes:
Update the platform-version-codename
2009-08-12 15:47:22 -07:00
Sriram Raman
20572dd352
Update the platform-version-codename
2009-08-12 15:22:34 -07:00
Gaurav Mathur
f7781090bd
am ab28cea5
: Frame-work for open source site
...
Merge commit 'ab28cea58db8b06ee0ffc41db87342487f53c1eb'
* commit 'ab28cea58db8b06ee0ffc41db87342487f53c1eb':
Frame-work for open source site
2009-08-12 12:36:42 -07:00
Dianne Hackborn
a37bdef67a
am 6929fb57
: Merge change 20880 into donut
...
Merge commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4'
* commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4':
Fix issue #2048267 : Run zipalign on all prebuilts
2009-08-12 12:05:27 -07:00
Raphael
cac4dccb0a
am 31a8ac22
: BUG 1993354 : Add zipalign to Windows SDK
...
Merge commit '31a8ac22585b2a8263892487bd38b64783402e06'
* commit '31a8ac22585b2a8263892487bd38b64783402e06':
BUG 1993354 : Add zipalign to Windows SDK
2009-08-12 12:04:53 -07:00
Gaurav Mathur
ab28cea58d
Frame-work for open source site
...
modified: customization.cs
2009-08-11 22:24:15 -07:00
Android (Google) Code Review
6929fb57a5
Merge change 20880 into donut
...
* changes:
Fix issue #2048267 : Run zipalign on all prebuilts
2009-08-11 19:56:57 -07:00
Dianne Hackborn
9c0c4b7a58
Fix issue #2048267 : Run zipalign on all prebuilts
2009-08-11 19:41:51 -07:00
Phil Dubach
378a5884da
am c539dbe6
: CTS: Add missing integration of 147397 to fix VM tests
...
Merge commit 'c539dbe6a2810818ac22f180e64bdc0256557532'
* commit 'c539dbe6a2810818ac22f180e64bdc0256557532':
CTS: Add missing integration of 147397 to fix VM tests
2009-08-11 18:11:22 -07:00
Raphael
31a8ac2258
BUG 1993354 : Add zipalign to Windows SDK
2009-08-11 15:36:16 -07:00
Android (Google) Code Review
3b55dfc9a7
Merge change 20816
...
* changes:
joeo here -- pesky findleaves.sh wasn't pruning directories.
2009-08-11 15:07:18 -07:00
Andrew Stadler
fbe107a8b3
joeo here -- pesky findleaves.sh wasn't pruning directories.
2009-08-11 15:05:59 -07:00
Ben Cheng
ab007efd2f
Install the generic version of adbs to build/tools.
2009-08-11 11:17:52 -07:00
Phil Dubach
c539dbe6a2
CTS: Add missing integration of 147397 to fix VM tests
...
For host side test packages, the name of the jar file containing the tests is
declared in the packages Android.mk. The name of the make file needs to be
passed to the description generator so that it can pick up this information.
The makefile was not passing on the parameter containing the make file name.
2009-08-10 14:23:23 -07:00
Doug Zongker
8510a1e0d7
use *_PARTITION_SIZE instead of *_MAX_SIZE
...
Make BoardConfig.mk store the size of the partition rather than the
maximum size of the image that can be flashed there, because the
function used to do the conversion isn't available when BoardConfig.mk
is read any more.
2009-08-10 09:03:16 -07:00
Joe Onorato
3366c07e56
Tweak the product graph formatting.
2009-08-08 12:15:10 -07:00
Brian Swetland
630b7d3ffa
build: do not attempt to build recovery.img for TINY_ANDROID builds
...
Signed-off-by: Brian Swetland <swetland@google.com>
2009-08-07 18:09:44 -07:00
Joe Onorato
4820a945a5
dedup findleaves output
2009-08-07 11:19:50 -07:00
Doug Zongker
edd731f430
am f7c8b9ad
: reenable ranlib transform for prebuilts
...
Merge commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba'
* commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba':
reenable ranlib transform for prebuilts
2009-08-07 09:15:21 -07:00
Doug Zongker
f7c8b9adb4
reenable ranlib transform for prebuilts
...
An extra blank line detached the ranlib commands from the rules they
were supposed to be for.
2009-08-07 08:45:49 -07:00
Doug Zongker
85416153ae
am d0a44722
: add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
...
Merge commit 'd0a44722be82319e45b6616267011d4dd17e767b'
* commit 'd0a44722be82319e45b6616267011d4dd17e767b':
add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
2009-08-06 21:56:50 -07:00
Doug Zongker
d0a44722be
add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
2009-08-06 21:52:47 -07:00
Android (Google) Code Review
80f820ca1a
am 01bf5684
: Merge change 20313 into donut
...
Merge commit '01bf5684b448623d7eb054b6d717bb77af05de33'
* commit '01bf5684b448623d7eb054b6d717bb77af05de33':
add feature to strip "# comment" lines from prebuilt files
2009-08-06 16:35:50 -07:00
Android (Google) Code Review
01bf5684b4
Merge change 20313 into donut
...
* changes:
add feature to strip "# comment" lines from prebuilt files
2009-08-06 16:33:21 -07:00
Android (Google) Code Review
3513846c0a
Merge change 20343
...
* changes:
Sort the results of findleaves.
2009-08-06 16:06:07 -07:00
Joe Onorato
d36e945e1a
Sort the results of findleaves.
...
Hopefully this will fix the seemingly random build breakages.
2009-08-06 16:05:02 -07:00
Android (Google) Code Review
e9024b3ee1
Merge change 20172
...
* changes:
Add back a few libraries for backward-compability with the donut skia
2009-08-06 14:52:39 -07:00
Doug Zongker
1046d20624
add feature to strip "# comment" lines from prebuilt files
...
Change things so that when $(LOCAL_PREBUILT_STRIP_COMMENTS) is
nonempty, we copy the source file using sed to strip out all the "#
line"-style comments and blank lines, saving considerable system image
space in the case of some wifi configurations.
Bug: 2036961
2009-08-06 14:39:43 -07:00