OSDN Git Service
Dirk Dougherty [Wed, 16 Sep 2009 18:30:41 +0000 (11:30 -0700)]
am
60bbe187: am
c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit '
60bbe187da1e0b5aa753c3611e81cbb61f886599' into eclair-plus-aosp
* commit '
60bbe187da1e0b5aa753c3611e81cbb61f886599':
Change sdk doc template so that ADT download link bypasses clickthrough.
Dirk Dougherty [Wed, 16 Sep 2009 18:23:08 +0000 (11:23 -0700)]
am
c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit '
c66c90a803ef256b5f945d10bd0ddd5abae15d64' into eclair
* commit '
c66c90a803ef256b5f945d10bd0ddd5abae15d64':
Change sdk doc template so that ADT download link bypasses clickthrough.
Dirk Dougherty [Wed, 16 Sep 2009 17:11:01 +0000 (10:11 -0700)]
Change sdk doc template so that ADT download link bypasses clickthrough.
Change-Id: Ibea052b718f17043c992af7d5334b1c7e4fe2c6b
Xavier Ducrohet [Tue, 15 Sep 2009 20:47:17 +0000 (13:47 -0700)]
am
502cf95a: am
743c1937: Merge change 24941 into donut
Merge commit '
502cf95ad4cfa1ae9506bf5ad9c938532a5bb57e' into eclair-plus-aosp
* commit '
502cf95ad4cfa1ae9506bf5ad9c938532a5bb57e':
Add TTS files and Accessibility app to the SDK system image.
Mike Ritter [Tue, 15 Sep 2009 20:45:42 +0000 (13:45 -0700)]
am
e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit '
e44fadeb49aac9d762f089ee2f23e4a4907a822f' into eclair-plus-aosp
* commit '
e44fadeb49aac9d762f089ee2f23e4a4907a822f':
Bug in Mac build where it gets confused over case, fix no longer needed.
Doug Zongker [Tue, 15 Sep 2009 20:45:39 +0000 (13:45 -0700)]
am
353448c7: Merge change 24973 into eclair
Merge commit '
353448c7b06847ac19a712439cebaee163a3e079' into eclair-plus-aosp
* commit '
353448c7b06847ac19a712439cebaee163a3e079':
increase reserved blocks from 5 to 8
Xavier Ducrohet [Tue, 15 Sep 2009 20:18:52 +0000 (13:18 -0700)]
am
743c1937: Merge change 24941 into donut
Merge commit '
743c19373a1c78bf2cc4d1c0dfd905e27ff598c6' into eclair
* commit '
743c19373a1c78bf2cc4d1c0dfd905e27ff598c6':
Add TTS files and Accessibility app to the SDK system image.
Mike Ritter [Tue, 15 Sep 2009 18:18:31 +0000 (11:18 -0700)]
Bug in Mac build where it gets confused over case, fix no longer needed.
Doug Zongker [Tue, 15 Sep 2009 00:46:41 +0000 (17:46 -0700)]
increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching. Take these all into account when
computing the max image size.
Android (Google) Code Review [Tue, 15 Sep 2009 00:54:13 +0000 (20:54 -0400)]
Merge change 24973 into eclair
* changes:
increase reserved blocks from 5 to 8
Doug Zongker [Tue, 15 Sep 2009 00:46:41 +0000 (17:46 -0700)]
increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching. Take these all into account when
computing the max image size.
Android (Google) Code Review [Mon, 14 Sep 2009 22:41:50 +0000 (18:41 -0400)]
Merge change 24941 into donut
* changes:
Add TTS files and Accessibility app to the SDK system image.
Xavier Ducrohet [Mon, 14 Sep 2009 22:00:27 +0000 (15:00 -0700)]
Add TTS files and Accessibility app to the SDK system image.
Xavier Ducrohet [Fri, 11 Sep 2009 19:06:49 +0000 (12:06 -0700)]
am
be49598e: Merge change 24712 into eclair
Merge commit '
be49598e2d7609e50eadd0dcba2190c01265c0a9' into eclair-plus-aosp
* commit '
be49598e2d7609e50eadd0dcba2190c01265c0a9':
Fix CS templates to handle non-included classes.
Android (Google) Code Review [Fri, 11 Sep 2009 18:58:54 +0000 (14:58 -0400)]
Merge change 24712 into eclair
* changes:
Fix CS templates to handle non-included classes.
Xavier Ducrohet [Fri, 11 Sep 2009 17:59:31 +0000 (10:59 -0700)]
Fix CS templates to handle non-included classes.
This fix is to handle generate documentation not including base clases
(like java.* or android.*). Links to missing base classes must not be
created or they would point nowhere.
Change-Id: Ic591916fe9b6802903d894bd2cd3c45690533912
Scott Main [Fri, 11 Sep 2009 17:58:58 +0000 (10:58 -0700)]
am
5175caf6: am
ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '
5175caf6eaab1b22c4cc1f352f22cd69d291a68e' into eclair-plus-aosp
* commit '
5175caf6eaab1b22c4cc1f352f22cd69d291a68e':
docs only.
Scott Main [Fri, 11 Sep 2009 17:49:26 +0000 (10:49 -0700)]
am
ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '
ded57160b406d5b253206cf5884ab9b33ac23b3c' into eclair
* commit '
ded57160b406d5b253206cf5884ab9b33ac23b3c':
docs only.
Scott Main [Fri, 11 Sep 2009 17:17:37 +0000 (10:17 -0700)]
docs only.
new donut image for compatibility with IE6 transparency issues
Change-Id: I444b09d7c5b211b3a07e7221ad96b3a7e4d989f7
Xavier Ducrohet [Thu, 10 Sep 2009 22:10:39 +0000 (15:10 -0700)]
am
85762123: Merge change 24584 into eclair
Merge commit '
857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp
* commit '
857621233a13b28a31cbd6e0ae4e2df4eed44d83':
Add support for @pending annotation.
Xavier Ducrohet [Thu, 10 Sep 2009 22:10:36 +0000 (15:10 -0700)]
am
a3c35d19: Merge change 24565 into eclair
Merge commit '
a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp
* commit '
a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
Add missing @Override to DroidDoc and ApiCheck
Android (Google) Code Review [Thu, 10 Sep 2009 22:03:47 +0000 (18:03 -0400)]
Merge change 24584 into eclair
* changes:
Add support for @pending annotation.
Android (Google) Code Review [Thu, 10 Sep 2009 22:03:32 +0000 (18:03 -0400)]
Merge change 24565 into eclair
* changes:
Add missing @Override to DroidDoc and ApiCheck
Xavier Ducrohet [Thu, 10 Sep 2009 21:50:12 +0000 (14:50 -0700)]
Add support for @pending annotation.
This behaves the same as @hide, but can be used to annotate API that are
only hidden pending API approval.
Change-Id: I4c0bf46c6d74ed45a8890ecdfd9b14ce234a5c18
Xavier Ducrohet [Thu, 10 Sep 2009 20:08:27 +0000 (13:08 -0700)]
Add missing @Override to DroidDoc and ApiCheck
Change-Id: Ic7829a4ea62a614ef8b525bd84f8fbaaa4674d06
Andy McFadden [Thu, 10 Sep 2009 17:45:25 +0000 (10:45 -0700)]
am
2c86bfd2: Sleazy workaround for webkit build failures.
Merge commit '
2c86bfd285d8b3765da0144da31d1a3d216cb95c' into eclair-plus-aosp
* commit '
2c86bfd285d8b3765da0144da31d1a3d216cb95c':
Sleazy workaround for webkit build failures.
Andy McFadden [Thu, 10 Sep 2009 17:05:14 +0000 (10:05 -0700)]
Sleazy workaround for webkit build failures.
The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.
This change truncates the "product" directory name to "pr", reducing the
command line by a few KB. This only affects sim-eng builds.
The real fix will need be to webkit (see internal bug
1917987), which
will eventually start failing on device builds if it continues to grow.
Andrei Popescu [Tue, 8 Sep 2009 20:39:46 +0000 (13:39 -0700)]
am
270de928: Cleanstep required by switching back to JSC in the browser
Merge commit '
270de9284a56f1e9646afb1cf7e9f2720ddaa7b0' into eclair-plus-aosp
* commit '
270de9284a56f1e9646afb1cf7e9f2720ddaa7b0':
Cleanstep required by switching back to JSC in the browser
Andrei Popescu [Tue, 8 Sep 2009 18:47:22 +0000 (19:47 +0100)]
Cleanstep required by switching back to JSC in the browser
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:50:42 +0000 (07:50 -0700)]
merge from open-source master
Mike Lockwood [Thu, 3 Sep 2009 21:21:50 +0000 (14:21 -0700)]
am
3e747ac3: Add clean step for /system/bin/bugreport symlink
Merge commit '
3e747ac3fe688c231bbf5591ee02226b394adf26' into eclair-plus-aosp
* commit '
3e747ac3fe688c231bbf5591ee02226b394adf26':
Add clean step for /system/bin/bugreport symlink
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:12:45 +0000 (14:12 -0700)]
merge from donut
Mike Lockwood [Thu, 3 Sep 2009 19:01:07 +0000 (15:01 -0400)]
Add clean step for /system/bin/bugreport symlink
Change-Id: Ib2abb22184b16b6b3c5bc0e38141922f3fcbfca0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dirk Dougherty [Thu, 3 Sep 2009 02:01:33 +0000 (19:01 -0700)]
am
af2a2a61: am
4d545a82: Merge change 23037 into donut
Merge commit '
af2a2a61ed0b60efa4b0e8852333ed4693834aca' into eclair-plus-aosp
* commit '
af2a2a61ed0b60efa4b0e8852333ed4693834aca':
Doc changes for SDK update.
Dirk Dougherty [Thu, 3 Sep 2009 01:58:52 +0000 (18:58 -0700)]
am
4d545a82: Merge change 23037 into donut
Merge commit '
4d545a82917db0ca90494e4cfb7944e1b5ea564a' into eclair
* commit '
4d545a82917db0ca90494e4cfb7944e1b5ea564a':
Doc changes for SDK update.
Android (Google) Code Review [Thu, 3 Sep 2009 01:57:09 +0000 (18:57 -0700)]
Merge change 23037 into donut
* changes:
Doc changes for SDK update. Update SDK toc template.
Doug Zongker [Wed, 2 Sep 2009 18:15:52 +0000 (11:15 -0700)]
am
d7d7ab00: do a pass of normal-chunk-merging before comparing src and tgt files
Merge commit '
d7d7ab00f58bd75ac185273f93d15533558a7f54' into eclair-plus-aosp
* commit '
d7d7ab00f58bd75ac185273f93d15533558a7f54':
do a pass of normal-chunk-merging before comparing src and tgt files
Doug Zongker [Wed, 2 Sep 2009 18:10:51 +0000 (11:10 -0700)]
do a pass of normal-chunk-merging before comparing src and tgt files
Merge the gzip footer and header together with any adjacent normal
chunks before comparing chunk structures; this should make the
recovery-from-boot diff not fail due to differences in the footer
after the ramdisk part of the image.
Doug Zongker [Wed, 2 Sep 2009 15:56:05 +0000 (08:56 -0700)]
am
15604b84: use imgdiff -z to diff zipfiles
Merge commit '
15604b84e246514da6c9721266919003f734380b' into eclair-plus-aosp
* commit '
15604b84e246514da6c9721266919003f734380b':
use imgdiff -z to diff zipfiles
Doug Zongker [Wed, 2 Sep 2009 00:53:34 +0000 (17:53 -0700)]
use imgdiff -z to diff zipfiles
imgdiff now understands the zip file format and can produce smaller
patches by doing the patching in uncompressed space. Start taking
advantage of this for .zip, .apk, and .jar files.
Scott Main [Tue, 1 Sep 2009 17:43:15 +0000 (10:43 -0700)]
am
cca05d9e: am
a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
Merge commit '
cca05d9e658b4357995a73ca72793d46100aae8e' into eclair-plus-aosp
* commit '
cca05d9e658b4357995a73ca72793d46100aae8e':
docs only.
Scott Main [Tue, 1 Sep 2009 17:41:03 +0000 (10:41 -0700)]
am
a01ee1ea: docs only. my previous change to the list styles was the wrong solution. this fixes all prior problems with nested lists in OLs, ULs, and DLs
Merge commit '
a01ee1ea93cd2a4d876fcb5678392bbd277b6042' into eclair
* commit '
a01ee1ea93cd2a4d876fcb5678392bbd277b6042':
docs only.
Scott Main [Tue, 1 Sep 2009 17:36:55 +0000 (10:36 -0700)]
docs only.
my previous change to the list styles was the wrong solution.
this fixes all prior problems with nested lists in OLs, ULs, and DLs
Jean-Baptiste Queru [Tue, 1 Sep 2009 15:27:43 +0000 (08:27 -0700)]
merge from open-source master
Xavier Ducrohet [Mon, 31 Aug 2009 23:44:24 +0000 (16:44 -0700)]
Add camera feature files to the SDK system image.
Without this the system refuses to install applications that
requires the camera (like ApiDemos)
Change-Id: Ia13b6a10f4731bf23eea04e3210ad0b3ed557aa6
Anonymous Coward [Mon, 31 Aug 2009 17:53:49 +0000 (10:53 -0700)]
am
f9f9d4f3: Remove WebSearchProvider from build specs.
Merge commit '
f9f9d4f3c393537f9cab5e8cc59d241ad2279474' into eclair
* commit '
f9f9d4f3c393537f9cab5e8cc59d241ad2279474':
Remove WebSearchProvider from build specs.
Anonymous Coward [Mon, 31 Aug 2009 14:10:01 +0000 (10:10 -0400)]
Remove WebSearchProvider from build specs.
Android (Google) Code Review [Sun, 30 Aug 2009 20:44:22 +0000 (13:44 -0700)]
Merge change 23258 into eclair
* changes:
Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
Joe Onorato [Sun, 30 Aug 2009 20:39:24 +0000 (13:39 -0700)]
Add the ability to turn on proguard for java targets, and to call aapt
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
Brett Chabot [Sat, 29 Aug 2009 23:44:39 +0000 (16:44 -0700)]
am
3c7c8a60: Merge change 22522 into donut
Merge commit '
3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair
* commit '
3c7c8a60860f97ac4c7381bd6ed30a43864372da':
Add Gesture tests to CTS.
Android (Google) Code Review [Sat, 29 Aug 2009 23:42:25 +0000 (16:42 -0700)]
Merge change 22522 into donut
* changes:
Add Gesture tests to CTS.
Daniel Sandler [Fri, 28 Aug 2009 14:00:12 +0000 (10:00 -0400)]
Introduce a default density ('mdpi') for all device builds.
This is done by appending "mdpi" (medium density or 160 dpi, which is what
we've been using so far on dream etc.) to PRODUCT_LOCALES if no other dpi is
found there. (PRODUCT_LOCALES is then sent as a configuration parameter to
aapt to determine which resources should be included in the build.)
With this change, each build will now include only one density of any given
asset. For example, if there exists
drawable-hdpi/foo.png
drawable-mdpi/foo.png
...then the build will include *only* drawable-mdpi/foo.png, unless the
density is overridden in the build's own device spec:
PRODUCT_LOCALES += hdpi
...in which case the build will include only drawable-hdpi/foo.png.
Dirk Dougherty [Thu, 27 Aug 2009 23:45:47 +0000 (16:45 -0700)]
Doc changes for SDK update.
Update SDK toc template.
Jay Schroeder [Thu, 27 Aug 2009 23:16:25 +0000 (18:16 -0500)]
kcm tool fix for the keyboard output permissions
This patch adds read permission for everyone to the output files of the
kcm tool. The compiled keycharmap files need to be able to be read by
everyone. This fixes a problem at startup being unable to read the
*.kcm.bin files located at <android-root>/system/usr/keychars.
Doug Zongker [Thu, 27 Aug 2009 23:12:00 +0000 (16:12 -0700)]
remove bootloader assertions
These should be done by the device-specific module where necessary;
they aren't appropriate for all devices.
Doug Zongker [Thu, 27 Aug 2009 06:22:05 +0000 (23:22 -0700)]
am
1b6d0a65: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
Merge commit '
1b6d0a65fc62901f2c18d00c556bd5da50f35584' into eclair
* commit '
1b6d0a65fc62901f2c18d00c556bd5da50f35584':
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
Doug Zongker [Thu, 27 Aug 2009 01:22:43 +0000 (18:22 -0700)]
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
If a prebuilt specifies a LOCAL_CERTIFICATE, stick it in the
PACKAGES.* collection so that the predexopt process can work on the
file (which only works if the new .apk can be signed).
Doug Zongker [Wed, 26 Aug 2009 18:41:13 +0000 (11:41 -0700)]
am
4ac1ba61: fix typo in bash expression
Merge commit '
4ac1ba61075190fa9ced594c85285beff6293184' into eclair
* commit '
4ac1ba61075190fa9ced594c85285beff6293184':
fix typo in bash expression
Doug Zongker [Wed, 26 Aug 2009 16:37:07 +0000 (09:37 -0700)]
resolved conflicts for merge of
6dd2ae02 to eclair
Scott Main [Wed, 26 Aug 2009 16:29:28 +0000 (09:29 -0700)]
Doug Zongker [Wed, 26 Aug 2009 03:38:50 +0000 (20:38 -0700)]
fix typo in bash expression
Fortunately the error doesn't change the value of the expression
(since undefined variables are treated as 0 inside "$((...))").
Doug Zongker [Wed, 26 Aug 2009 00:23:57 +0000 (17:23 -0700)]
turn down allowed image size
yaffs appears to reserve 5 blocks on the partition for itself.
Account for this when computing the maximum allowable image size.
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.
Brett Chabot [Tue, 25 Aug 2009 00:30:41 +0000 (17:30 -0700)]
Add Gesture tests to CTS.
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.