OSDN Git Service
Scott Main [Wed, 26 Aug 2009 16:29:28 +0000 (09:29 -0700)]
Android (Google) Code Review [Tue, 25 Aug 2009 23:33:12 +0000 (16:33 -0700)]
Merge change 22524 into donut
* changes:
docs only. fix api level highlighting for the treeview navigation.
Scott Main [Tue, 25 Aug 2009 00:33:06 +0000 (17:33 -0700)]
docs only.
fix api level highlighting for the treeview navigation.
Phil Dubach [Mon, 24 Aug 2009 22:51:51 +0000 (15:51 -0700)]
am
793817ba: CTS: Add missing make dependencies for application security tests
Merge commit '
793817baa1455c410311d79ef6f44cac1c26be9f' into eclair
* commit '
793817baa1455c410311d79ef6f44cac1c26be9f':
CTS: Add missing make dependencies for application security tests
Phil Dubach [Mon, 24 Aug 2009 21:18:15 +0000 (14:18 -0700)]
CTS: Add missing make dependencies for application security tests
Change-Id: I4d069b18b0da5f49ca9bb377d04732b8222ac137
Phil Dubach [Mon, 24 Aug 2009 20:39:32 +0000 (13:39 -0700)]
am
3b7521b5: CTS: Add application security tests to makefile
Merge commit '
3b7521b524de694cb9da277fd1d7493fc41aa0f3' into eclair
* commit '
3b7521b524de694cb9da277fd1d7493fc41aa0f3':
CTS: Add application security tests to makefile
Doug Zongker [Mon, 24 Aug 2009 20:39:30 +0000 (13:39 -0700)]
am
8fead691: Merge change 22448 into donut
Merge commit '
8fead6912ed3f04867974631935435a887ed889d' into eclair
* commit '
8fead6912ed3f04867974631935435a887ed889d':
incremental OTAs should remove /system/recovery.img
Phil Dubach [Wed, 19 Aug 2009 23:26:40 +0000 (16:26 -0700)]
CTS: Add application security tests to makefile
Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
Android (Google) Code Review [Mon, 24 Aug 2009 17:36:06 +0000 (10:36 -0700)]
Merge change 22448 into donut
* changes:
incremental OTAs should remove /system/recovery.img
Doug Zongker [Mon, 24 Aug 2009 17:24:32 +0000 (10:24 -0700)]
incremental OTAs should remove /system/recovery.img
This file has been replaced by the recovery_from_boot.p patch file,
but needs to be removed from existing devices if it exists.
Scott Su [Mon, 24 Aug 2009 05:44:05 +0000 (13:44 +0800)]
Remove frameworks/base/im from build path
Scott Main [Sat, 22 Aug 2009 14:44:20 +0000 (07:44 -0700)]
Scott Main [Sat, 22 Aug 2009 14:44:16 +0000 (07:44 -0700)]
Phil Dubach [Sat, 22 Aug 2009 14:43:37 +0000 (07:43 -0700)]
am
7c463e4b: Merge change 21778 into donut
Merge commit '
7c463e4b0565f752bc06feb98962ab1536937aa1' into eclair
* commit '
7c463e4b0565f752bc06feb98962ab1536937aa1':
CTS: Enable Python description/plan generator
Android (Google) Code Review [Fri, 21 Aug 2009 23:38:35 +0000 (16:38 -0700)]
Merge change 22354 into donut
* changes:
docs only. add donut image for homepage announcement.
Scott Main [Fri, 21 Aug 2009 23:37:09 +0000 (16:37 -0700)]
docs only.
add donut image for homepage announcement.
Android (Google) Code Review [Fri, 21 Aug 2009 23:12:25 +0000 (16:12 -0700)]
Merge change 22348 into donut
* changes:
docs only. remove preliminary watermak
Scott Main [Fri, 21 Aug 2009 23:11:02 +0000 (16:11 -0700)]
docs only.
remove preliminary watermak
Android (Google) Code Review [Fri, 21 Aug 2009 21:41:40 +0000 (14:41 -0700)]
Merge change 21778 into donut
* changes:
CTS: Enable Python description/plan generator
Jeff Hamilton [Fri, 21 Aug 2009 05:38:17 +0000 (00:38 -0500)]
Prefer ContactsProvider over GoogleContactsProvider.
Doug Zongker [Fri, 21 Aug 2009 01:18:29 +0000 (18:18 -0700)]
am
e05628cc: fix signing user builds
Merge commit '
e05628cc8df4ec4b69befa9652d81eb81f0ab008' into eclair
* commit '
e05628cc8df4ec4b69befa9652d81eb81f0ab008':
fix signing user builds
Doug Zongker [Fri, 21 Aug 2009 00:38:42 +0000 (17:38 -0700)]
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.
Dirk Dougherty [Thu, 20 Aug 2009 17:36:47 +0000 (10:36 -0700)]
am
6f7ba2dc: Merge change 20234 into donut
Merge commit '
6f7ba2dce2c112eb4be33dbad54751d55ddd2276' into eclair
* commit '
6f7ba2dce2c112eb4be33dbad54751d55ddd2276':
Remove extraneous quotation mark in template file
Android (Google) Code Review [Thu, 20 Aug 2009 17:33:11 +0000 (10:33 -0700)]
Merge change 20234 into donut
* changes:
Remove extraneous quotation mark in template file
Andrei Popescu [Thu, 20 Aug 2009 11:42:30 +0000 (12:42 +0100)]
Clean libwebcore after new WebKit merge
Phil Dubach [Fri, 14 Aug 2009 20:48:34 +0000 (13:48 -0700)]
CTS: Enable Python description/plan generator
This enables the new description/plan generator added in change
21366.
Android (Google) Code Review [Wed, 19 Aug 2009 21:46:27 +0000 (14:46 -0700)]
Merge change 21912 into eclair
* changes:
Bump platform version to 4.
Raphael [Wed, 19 Aug 2009 21:06:33 +0000 (14:06 -0700)]
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.
Android (Google) Code Review [Wed, 19 Aug 2009 19:11:38 +0000 (12:11 -0700)]
Merge change 21783 into eclair
* changes:
Windows: Fix platform build.
Raphael [Tue, 18 Aug 2009 21:43:32 +0000 (14:43 -0700)]
Windows: Fix platform build.
Scott Main [Wed, 19 Aug 2009 18:05:04 +0000 (11:05 -0700)]
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.
Dianne Hackborn [Wed, 19 Aug 2009 18:00:21 +0000 (11:00 -0700)]
Bump platform version to 4.
Not sure why this didn't get integrated from Donut.
Chih-Chung Chang [Wed, 19 Aug 2009 10:12:32 +0000 (18:12 +0800)]
Need this to update system properties (for change 21876).
Scott Main [Wed, 19 Aug 2009 02:00:11 +0000 (19:00 -0700)]
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.
Doug Zongker [Fri, 14 Aug 2009 23:42:35 +0000 (16:42 -0700)]
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.
Doug Zongker [Fri, 14 Aug 2009 22:25:06 +0000 (15:25 -0700)]
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.
Doug Zongker [Fri, 14 Aug 2009 19:44:19 +0000 (12:44 -0700)]
update OTA package maker to do whole-file signature
Use the new -w flag to SignApk when signing OTA packages.
Doug Zongker [Thu, 13 Aug 2009 01:20:24 +0000 (18:20 -0700)]
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.
Android (Google) Code Review [Thu, 13 Aug 2009 19:03:57 +0000 (12:03 -0700)]
Merge change 21127
* changes:
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
Marco Nelissen [Thu, 13 Aug 2009 18:13:21 +0000 (11:13 -0700)]
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
Sriram Raman [Thu, 13 Aug 2009 02:44:20 +0000 (19:44 -0700)]
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)
Sriram Raman [Thu, 13 Aug 2009 02:44:18 +0000 (19:44 -0700)]
am
5b5f82b6: (-s ours) Merge change 21000 into donut
Merge commit '
5b5f82b635697159aeca23ceb0ec9d692c5a04f0'
* commit '
5b5f82b635697159aeca23ceb0ec9d692c5a04f0':
Update the platform-version-codename
Sriram Raman [Wed, 12 Aug 2009 23:02:12 +0000 (16:02 -0700)]
Fix the platform version (1.6 now) and sdk version (4)
Android (Google) Code Review [Wed, 12 Aug 2009 22:47:22 +0000 (15:47 -0700)]
Merge change 21000 into donut
* changes:
Update the platform-version-codename
Sriram Raman [Wed, 12 Aug 2009 22:22:34 +0000 (15:22 -0700)]
Update the platform-version-codename
Gaurav Mathur [Wed, 12 Aug 2009 19:36:42 +0000 (12:36 -0700)]
am
ab28cea5: Frame-work for open source site
Merge commit '
ab28cea58db8b06ee0ffc41db87342487f53c1eb'
* commit '
ab28cea58db8b06ee0ffc41db87342487f53c1eb':
Frame-work for open source site
Dianne Hackborn [Wed, 12 Aug 2009 19:05:27 +0000 (12:05 -0700)]
am
6929fb57: Merge change 20880 into donut
Merge commit '
6929fb57a5afb90606feb8c35c8c2cda170adfe4'
* commit '
6929fb57a5afb90606feb8c35c8c2cda170adfe4':
Fix issue #
2048267: Run zipalign on all prebuilts
Raphael [Wed, 12 Aug 2009 19:04:53 +0000 (12:04 -0700)]
am
31a8ac22: BUG
1993354 : Add zipalign to Windows SDK
Merge commit '
31a8ac22585b2a8263892487bd38b64783402e06'
* commit '
31a8ac22585b2a8263892487bd38b64783402e06':
BUG
1993354 : Add zipalign to Windows SDK
Gaurav Mathur [Wed, 12 Aug 2009 05:24:15 +0000 (22:24 -0700)]
Frame-work for open source site
modified: customization.cs
Android (Google) Code Review [Wed, 12 Aug 2009 02:56:57 +0000 (19:56 -0700)]
Merge change 20880 into donut
* changes:
Fix issue #
2048267: Run zipalign on all prebuilts
Dianne Hackborn [Wed, 12 Aug 2009 02:16:46 +0000 (19:16 -0700)]
Fix issue #
2048267: Run zipalign on all prebuilts
Phil Dubach [Wed, 12 Aug 2009 01:11:22 +0000 (18:11 -0700)]
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
Raphael [Tue, 11 Aug 2009 22:36:16 +0000 (15:36 -0700)]
BUG
1993354 : Add zipalign to Windows SDK
Android (Google) Code Review [Tue, 11 Aug 2009 22:07:18 +0000 (15:07 -0700)]
Merge change 20816
* changes:
joeo here -- pesky findleaves.sh wasn't pruning directories.
Andrew Stadler [Tue, 11 Aug 2009 22:05:59 +0000 (15:05 -0700)]
joeo here -- pesky findleaves.sh wasn't pruning directories.
Ben Cheng [Tue, 11 Aug 2009 18:15:26 +0000 (11:15 -0700)]
Install the generic version of adbs to build/tools.
Phil Dubach [Fri, 7 Aug 2009 17:59:04 +0000 (10:59 -0700)]
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.
Doug Zongker [Fri, 7 Aug 2009 23:38:08 +0000 (16:38 -0700)]
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.
Joe Onorato [Sat, 8 Aug 2009 19:14:37 +0000 (12:14 -0700)]
Tweak the product graph formatting.
Brian Swetland [Sat, 8 Aug 2009 01:09:44 +0000 (18:09 -0700)]
build: do not attempt to build recovery.img for TINY_ANDROID builds
Signed-off-by: Brian Swetland <swetland@google.com>
Joe Onorato [Fri, 7 Aug 2009 18:19:34 +0000 (11:19 -0700)]
dedup findleaves output
Doug Zongker [Fri, 7 Aug 2009 16:15:21 +0000 (09:15 -0700)]
am
f7c8b9ad: reenable ranlib transform for prebuilts
Merge commit '
f7c8b9adb4b65fafac786e77f6dd7c3411344dba'
* commit '
f7c8b9adb4b65fafac786e77f6dd7c3411344dba':
reenable ranlib transform for prebuilts
Doug Zongker [Fri, 7 Aug 2009 15:45:49 +0000 (08:45 -0700)]
reenable ranlib transform for prebuilts
An extra blank line detached the ranlib commands from the rules they
were supposed to be for.
Doug Zongker [Fri, 7 Aug 2009 04:56:50 +0000 (21:56 -0700)]
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
Doug Zongker [Fri, 7 Aug 2009 04:50:51 +0000 (21:50 -0700)]
add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
Android (Google) Code Review [Thu, 6 Aug 2009 23:35:50 +0000 (16:35 -0700)]
am
01bf5684: Merge change 20313 into donut
Merge commit '
01bf5684b448623d7eb054b6d717bb77af05de33'
* commit '
01bf5684b448623d7eb054b6d717bb77af05de33':
add feature to strip "# comment" lines from prebuilt files
Android (Google) Code Review [Thu, 6 Aug 2009 23:33:21 +0000 (16:33 -0700)]
Merge change 20313 into donut
* changes:
add feature to strip "# comment" lines from prebuilt files
Android (Google) Code Review [Thu, 6 Aug 2009 23:06:07 +0000 (16:06 -0700)]
Merge change 20343
* changes:
Sort the results of findleaves.
Joe Onorato [Thu, 6 Aug 2009 23:05:02 +0000 (16:05 -0700)]
Sort the results of findleaves.
Hopefully this will fix the seemingly random build breakages.
Android (Google) Code Review [Thu, 6 Aug 2009 21:52:39 +0000 (14:52 -0700)]
Merge change 20172
* changes:
Add back a few libraries for backward-compability with the donut skia
Doug Zongker [Thu, 6 Aug 2009 20:02:19 +0000 (13:02 -0700)]
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
Joe Onorato [Tue, 4 Aug 2009 19:58:26 +0000 (15:58 -0400)]
Rewrite findleaves.sh in python
This cuts the make startup time by about 30 seconds. Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.
This is from my mac laptop:
$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null
real 0m29.186s
user 0m0.550s
sys 0m5.897s
$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null
real 0m4.701s
user 0m0.645s
sys 0m1.294s
$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real 0m0.176s
user 0m0.094s
sys 0m0.080s
Jean-Baptiste Queru [Thu, 6 Aug 2009 15:09:30 +0000 (08:09 -0700)]
merge from open-source master
Scott Main [Thu, 6 Aug 2009 09:45:17 +0000 (02:45 -0700)]
am
95641e97: fix css image references for offline docs
Merge commit '
95641e9759b74fe61ff138970ca8aa2a9f34a080'
* commit '
95641e9759b74fe61ff138970ca8aa2a9f34a080':
fix css image references for offline docs
Scott Main [Thu, 6 Aug 2009 09:36:50 +0000 (02:36 -0700)]
fix css image references for offline docs
Scott Main [Thu, 6 Aug 2009 06:43:15 +0000 (23:43 -0700)]
am
fa4765e0: lighten up on "preliminary" watermark
Merge commit '
fa4765e0dc46af4d131fc9e914e114b4f59d4a80'
* commit '
fa4765e0dc46af4d131fc9e914e114b4f59d4a80':
lighten up on "preliminary" watermark
Scott Main [Thu, 6 Aug 2009 06:39:08 +0000 (23:39 -0700)]
lighten up on "preliminary" watermark
Android (Google) Code Review [Thu, 6 Aug 2009 05:11:37 +0000 (22:11 -0700)]
am
11be8c3e: Merge change 20232 into donut
Merge commit '
11be8c3e5f2fd950b14bd17af9b67c25a15970f8'
* commit '
11be8c3e5f2fd950b14bd17af9b67c25a15970f8':
Fix broken url in offline preview docs
Android (Google) Code Review [Thu, 6 Aug 2009 05:09:17 +0000 (22:09 -0700)]
Merge change 20232 into donut
* changes:
Fix broken url in offline preview docs
Android (Google) Code Review [Thu, 6 Aug 2009 03:46:45 +0000 (20:46 -0700)]
am
89e555f3: Merge change 20222 into donut
Merge commit '
89e555f3c5ccb44f15995d5d59854c4e0f9450fa'
* commit '
89e555f3c5ccb44f15995d5d59854c4e0f9450fa':
Add support for preview SDK handling in doc templates.
Android (Google) Code Review [Thu, 6 Aug 2009 03:44:28 +0000 (20:44 -0700)]
Merge change 20222 into donut
* changes:
Add support for preview SDK handling in doc templates.
Dirk Dougherty [Thu, 6 Aug 2009 03:35:31 +0000 (20:35 -0700)]
Remove extraneous quotation mark in template file
Bug:
2031559
Dirk Dougherty [Thu, 6 Aug 2009 03:19:16 +0000 (20:19 -0700)]
Fix broken url in offline preview docs
Bug:
2031159
Dirk Dougherty [Thu, 6 Aug 2009 02:09:16 +0000 (19:09 -0700)]
Add support for preview SDK handling in doc templates.
Bug:
2031559
Jean-Baptiste Queru [Wed, 5 Aug 2009 22:17:42 +0000 (15:17 -0700)]
Add back a few libraries for backward-compability with the donut skia
Jean-Baptiste Queru [Wed, 5 Aug 2009 20:14:32 +0000 (13:14 -0700)]
Add libacc.so to prelink map for forward-compatibility
Android (Google) Code Review [Wed, 5 Aug 2009 19:01:29 +0000 (12:01 -0700)]
am
28ab3b12: Merge change 8917 into donut
Merge commit '
28ab3b12d38f1e613d92fcee251ef064665dd8c9'
* commit '
28ab3b12d38f1e613d92fcee251ef064665dd8c9':
implement api level toggling
Android (Google) Code Review [Wed, 5 Aug 2009 18:55:54 +0000 (11:55 -0700)]
Merge change 8917 into donut
* changes:
implement api level toggling and rename navtree.js to android-developer-reference.js for all reference related scripts TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
Scott Main [Tue, 4 Aug 2009 18:26:30 +0000 (11:26 -0700)]
implement api level toggling
and rename navtree.js to android-developer-reference.js for all reference related scripts
TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
Android (Google) Code Review [Wed, 5 Aug 2009 00:25:21 +0000 (17:25 -0700)]
Merge change 20007
* changes:
Add Bluetooth app to generic product file.
Doug Zongker [Tue, 4 Aug 2009 22:14:01 +0000 (15:14 -0700)]
am
1aca962a: allow for malformed imagesizes.txt
Merge commit '
1aca962af153d6437937e3e687740d2c1c12657d'
* commit '
1aca962af153d6437937e3e687740d2c1c12657d':
allow for malformed imagesizes.txt
Doug Zongker [Tue, 4 Aug 2009 22:09:27 +0000 (15:09 -0700)]
allow for malformed imagesizes.txt
Some builds have blank values for max image sizes; ignore these lines.
Android (Google) Code Review [Tue, 4 Aug 2009 21:16:38 +0000 (14:16 -0700)]
am
b6153173: Merge change 9605 into donut
Merge commit '
b6153173952895441e55d0ff6be332bb7c7605e2'
* commit '
b6153173952895441e55d0ff6be332bb7c7605e2':
use the max image sizes from the target files zip
Android (Google) Code Review [Tue, 4 Aug 2009 21:11:15 +0000 (14:11 -0700)]
Merge change 9605 into donut
* changes:
use the max image sizes from the target files zip
Jaikumar Ganesh [Tue, 4 Aug 2009 21:06:45 +0000 (14:06 -0700)]
Add Bluetooth app to generic product file.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:01:27 +0000 (09:01 -0700)]
merge from open-source master
Doug Zongker [Tue, 4 Aug 2009 00:27:48 +0000 (17:27 -0700)]
use the max image sizes from the target files zip
For some time now the build system has included all the max image
sizes in a file in the META directory. Use these instead of needing
to parse the BoardConfig.mk file for the device at the time of
building an image or OTA package.
Doug Zongker [Mon, 3 Aug 2009 23:55:57 +0000 (16:55 -0700)]
am
828bbfb1: in amend, remove symlink targets before creating them
Merge commit '
828bbfb18838f04b93ffbed0d7d3b597beaa534c'
* commit '
828bbfb18838f04b93ffbed0d7d3b597beaa534c':
in amend, remove symlink targets before creating them
Doug Zongker [Mon, 3 Aug 2009 21:11:09 +0000 (14:11 -0700)]
in amend, remove symlink targets before creating them
amend's symlink command isn't idempotent, so if you restart after the
symlinks have been completed then the second installation attempt will
fail. Work around this by deleting all symlink targets before
creating symlinks.
Bug:
2020011
Jean-Baptiste Queru [Mon, 3 Aug 2009 14:50:30 +0000 (07:50 -0700)]
merge from donut