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
1c86532604
am 0db6f1ed: Need this to update system properties (for change 21876).
...
Merge commit '0db6f1ed396fef320d52f722c45daadf9a98f9ee'
* commit '0db6f1ed396fef320d52f722c45daadf9a98f9ee':
Need this to update system properties (for change 21876).
2009-08-19 07:23:57 -07:00
The Android Open Source Project
fd0ac871ec
ERC50
2009-08-19 07:06: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
The Android Open Source Project
dfe9c92a5e
DRC49
2009-08-18 14:11:06 -07:00
The Android Open Source Project
530107a5ce
ERC49
2009-08-18 07:05:53 -07:00
The Android Open Source Project
92c9c970f5
DRC48
2009-08-17 15:47:00 -07:00
Jesse Wilson
90c1d538f9
Fixed droiddoc to properly version varargs and type-parameter methods.
...
This also removes many false-positive warnings in the droiddoc output
from methods whose visibility didn't require documentation.
2009-08-17 14:23:31 -07:00
The Android Open Source Project
7a7f713308
ERC48
2009-08-17 07:05:38 -07:00
The Android Open Source Project
24a9d84fd3
Merge commit 'remotes/goog/eclair' into eclair-release
2009-08-17 07:05:26 -07:00
Doug Zongker
0c72ede79e
am badd2ca4: fix endianness problem with the tail of the signature comment
...
Merge commit 'badd2ca451ee7a408f55632025cbe69649b426b5'
* commit 'badd2ca451ee7a408f55632025cbe69649b426b5':
fix endianness problem with the tail of the signature comment
2009-08-14 17:28:43 -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
c00d14d937
am 09cf5600: explicitly set max heap size when running signapk
...
Merge commit '09cf56001a214bdb22b720c323b9c7c73feea63f'
* commit '09cf56001a214bdb22b720c323b9c7c73feea63f':
explicitly set max heap size when running signapk
2009-08-14 15:30:06 -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
5dfed8f8f6
am 951495fc: update OTA package maker to do whole-file signature
...
Merge commit '951495fc4802a3603f654c02c7acceda4859f5e1'
* commit '951495fc4802a3603f654c02c7acceda4859f5e1':
update OTA package maker to do whole-file signature
2009-08-14 15:12:45 -07:00
Doug Zongker
a337914243
am c6cf01a1: add whole-file signature mode to SignApk
...
Merge commit 'c6cf01a1170c3a7a5b03135b01cf97f06e1b953d'
* commit 'c6cf01a1170c3a7a5b03135b01cf97f06e1b953d':
add whole-file signature mode to SignApk
2009-08-14 15:12:43 -07:00
The Android Open Source Project
2e8ee4239d
DRC45B
2009-08-14 14:30:53 -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
5582d77905
Merge change 21042
...
* changes:
add whole-file signature mode to SignApk
2009-08-14 12:16:25 -07:00
The Android Open Source Project
3477723415
DRC45
2009-08-14 11:49:47 -07:00
The Android Open Source Project
6a65d0ce38
ERC45
2009-08-14 07:04:24 -07:00
The Android Open Source Project
104317c227
ERC44C
2009-08-13 19:46:14 -07:00
The Android Open Source Project
367346f849
DRC44
2009-08-13 14:13:15 -07:00
The Android Open Source Project
74b35c3ded
Merge commit 'remotes/goog/donut' into donut-release
2009-08-13 14:13:05 -07:00
The Android Open Source Project
d11edaf9a1
ERC44B
2009-08-13 12:12:36 -07:00
The Android Open Source Project
7829dcfbe7
Merge commit 'remotes/goog/master' into eclair-release
2009-08-13 12:12:24 -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
The Android Open Source Project
23009a0823
ERC44
2009-08-13 07:06:46 -07:00
The Android Open Source Project
944c8f858f
Merge commit 'remotes/goog/master' into eclair-release
2009-08-13 07:06:34 -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
Doug Zongker
e74d8d1f85
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-12 18:20:24 -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
The Android Open Source Project
fa6258f84f
DRC43
2009-08-12 10:41:20 -07:00
The Android Open Source Project
8857b5f513
Merge commit 'remotes/goog/donut' into donut-release
2009-08-12 10:41:09 -07:00
The Android Open Source Project
3cf379a56d
ERC43
2009-08-12 08:36:10 -07:00
The Android Open Source Project
35ec11c757
Merge commit 'remotes/goog/master' into eclair-release
2009-08-12 08:35:58 -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
