OSDN Git Service
Chih-Chung Chang [Wed, 19 Aug 2009 10:12:32 +0000 (18:12 +0800)]
Need this to update system properties (for change 21876).
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: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
Android (Google) Code Review [Fri, 31 Jul 2009 16:43:24 +0000 (09:43 -0700)]
Merge change 9346
* changes:
Update warn.py with the latest warnings that popped up in the build.
Marco Nelissen [Fri, 31 Jul 2009 15:30:34 +0000 (08:30 -0700)]
Update warn.py with the latest warnings that popped up in the build.
Dan Egnor [Thu, 30 Jul 2009 23:53:26 +0000 (16:53 -0700)]
oops, missed one
Dan Egnor [Thu, 30 Jul 2009 23:23:04 +0000 (16:23 -0700)]
Needed for incremental builds after MD2 removal
Joe Onorato [Thu, 30 Jul 2009 18:54:27 +0000 (11:54 -0700)]
Don't check build tools versions (including javac) every time make is run.
This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
Joe Onorato [Thu, 30 Jul 2009 18:20:04 +0000 (11:20 -0700)]
Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.
This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
Joe Onorato [Thu, 30 Jul 2009 17:23:21 +0000 (10:23 -0700)]
Add cproj function to envsetup.sh that finds an Android.mk and goes to its directory.
Android (Google) Code Review [Thu, 30 Jul 2009 13:56:59 +0000 (06:56 -0700)]
am
7ebafd5a: Merge change 9009 into donut
Merge commit '
7ebafd5aa03e9d84696be0448f9d248e8f90e16c'
* commit '
7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
Reapply modifications from 3175 to fix display of navTree in doc output.
Phil Dubach [Thu, 30 Jul 2009 13:56:47 +0000 (06:56 -0700)]
am
951f3d89: CTS: Add telephony and webkit test cases to CTS makefile
Merge commit '
951f3d89fb8c61264a20f9e44b7882e6f562e1d3'
* commit '
951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
CTS: Add telephony and webkit test cases to CTS makefile
Daisuke Miyakawa [Thu, 30 Jul 2009 13:56:45 +0000 (06:56 -0700)]
am
981bafb1: AI 150131: Remove English/Chinese IME from OpenWnn.
Merge commit '
981bafb11bf73806f78676d7a1bdc98e3c92bd16'
* commit '
981bafb11bf73806f78676d7a1bdc98e3c92bd16':
AI 150131: Remove English/Chinese IME from OpenWnn.
Jean-Baptiste Queru [Wed, 29 Jul 2009 23:48:32 +0000 (16:48 -0700)]
am
239637ea: (-s ours) findleaves.sh: Properly fix arguments.
Merge commit '
239637eac86c8f4f92384891a8f99085039a5778'
* commit '
239637eac86c8f4f92384891a8f99085039a5778':
findleaves.sh: Properly fix arguments.
Android (Google) Code Review [Wed, 29 Jul 2009 23:44:58 +0000 (16:44 -0700)]
am
c16c0a41: Merge change 8942 into donut
Merge commit '
c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'
* commit '
c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
Add CTS permission2 test package to cts.
Scott Main [Wed, 29 Jul 2009 23:44:56 +0000 (16:44 -0700)]
am
df09424f: Patch 2: some fixes to the developer-docs stylesheet.... Patch 3: add "Since:" to the api level info Patch 4: fix packages page and styles to reveal class summary
Merge commit '
df09424f19ca8d455037b19641b15a7c55d9523f'
* commit '
df09424f19ca8d455037b19641b15a7c55d9523f':
Patch 2: some fixes to the developer-docs stylesheet....
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:56:48 +0000 (14:56 -0700)]
merge from donut
Android (Google) Code Review [Wed, 29 Jul 2009 20:58:07 +0000 (13:58 -0700)]
Merge change 9009 into donut
* changes:
Reapply modifications from 3175 to fix display of navTree in doc output.
Android (Google) Code Review [Wed, 29 Jul 2009 20:55:29 +0000 (13:55 -0700)]
Merge change 9010
* changes:
include GoogleContactsSyncAdapter in products with google
Fred Quintana [Wed, 29 Jul 2009 19:47:54 +0000 (12:47 -0700)]
include GoogleContactsSyncAdapter in products with google
Dirk Dougherty [Wed, 29 Jul 2009 19:25:44 +0000 (12:25 -0700)]
Reapply modifications from 3175 to fix display of navTree in doc output.
Phil Dubach [Wed, 15 Jul 2009 02:11:30 +0000 (19:11 -0700)]
CTS: Add telephony and webkit test cases to CTS makefile
Daisuke Miyakawa [Thu, 25 Jun 2009 23:52:13 +0000 (16:52 -0700)]
AI 150131: Remove English/Chinese IME from OpenWnn.
Automated import of CL 150131
Jean-Baptiste Queru [Wed, 29 Jul 2009 14:35:15 +0000 (07:35 -0700)]
findleaves.sh: Properly fix arguments.
the first argument is the executable (here findleaves.sh), therefore we
need to start popping from the 2nd argument (1).
Conflicts:
tools/findleaves.sh
Android (Google) Code Review [Wed, 29 Jul 2009 03:38:42 +0000 (20:38 -0700)]
Merge change 8942 into donut
* changes:
Add CTS permission2 test package to cts.
Brett Chabot [Wed, 29 Jul 2009 03:11:24 +0000 (20:11 -0700)]
Add CTS permission2 test package to cts.
Joe Onorato [Wed, 29 Jul 2009 01:22:25 +0000 (18:22 -0700)]
Make the product graph slightly more readable.
Scott Main [Mon, 27 Jul 2009 16:47:11 +0000 (09:47 -0700)]
Patch 2: some fixes to the developer-docs stylesheet....
Patch 3: add "Since:" to the api level info
Patch 4: fix packages page and styles to reveal class summary
Squashed commit of the following:
commit
8fcdcb8dcbe9b93688f5eb1020654848d3242675
Author: Scott Main <smain@google.com>
Date: Mon Jul 27 09:33:45 2009 -0700
remove the toggle selector from the header.
this will be added in a later change with the rest of the toggle script
commit
2423b30ee46c12f92051c4f2a096532e55752c46
Author: Scott Main <smain@google.com>
Date: Fri Jul 24 16:29:21 2009 -0700
Implement API Level styles.
This changes the way we show the API Level for a given package/class/member.
It also provides hooks in the document to allow us to restyle items
based on a user-selected API Level (show/hide available items).
More changes to provide the toggling feature will come soon.
commit
efd94b33071070f0dfc2045131b81cbdfe078468
Author: Scott Main <smain@google.com>
Date: Mon Jul 27 09:33:45 2009 -0700
remove the toggle selector from the header.
this will be added in a later change with the rest of the toggle script
commit
3fb79313232c993f700ee90a94f59dcca275fb0b
Author: Scott Main <smain@google.com>
Date: Fri Jul 24 16:29:21 2009 -0700
Implement API Level styles.
This changes the way we show the API Level for a given package/class/member.
It also provides hooks in the document to allow us to restyle items
based on a user-selected API Level (show/hide available items).
More changes to provide the toggling feature will come soon.
Wei Huang [Fri, 24 Jul 2009 00:44:48 +0000 (17:44 -0700)]
clean step for data messaging api.
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:53 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sat, 25 Jul 2009 23:58:22 +0000 (16:58 -0700)]
Merge korg/donut into korg/master
Conflicts:
core/apicheck_msg_current.txt
core/combo/linux-arm.mk
core/prelink-linux-arm.map
tools/droiddoc/src/ClassInfo.java
Dirk Dougherty [Sat, 25 Jul 2009 17:12:09 +0000 (10:12 -0700)]
am
882bbe14: Merge commit \'
5db40c6db73db3f4433dd3456107efb4468a4a99\' into manualmergeDroiddoc
Merge commit '
882bbe1489518cabb661e06f6e87a6561d9239df'
* commit '
882bbe1489518cabb661e06f6e87a6561d9239df':
AI 150594: change the homepage markup and styles to allow variable height in
AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
AI 150535: add the Videos page to the site
Dirk Dougherty [Sat, 25 Jul 2009 17:12:07 +0000 (10:12 -0700)]
am
da069618: Merge commit \'
db3b6e832261e7b9a09e1c646f7963b839d954cc\' into manualmergeDroiddoc
Merge commit '
da0696187b6927270a6b8a15785aaa328c3030bd'
* commit '
da0696187b6927270a6b8a15785aaa328c3030bd':
AI 150470: CTS: Fix naming for extra permission tests and include them in makefile
AI 150428: update the jquery library to version 1.3.2.
AI 150398: fix the sdk build break
AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
AI 150389: Fix handling of cookie writes for intl pages.
AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
Scott Main [Sat, 25 Jul 2009 17:12:06 +0000 (10:12 -0700)]
am
1aa2380c: AI 150428: update the jquery library to version 1.3.2. the incentive is to utilize an improvement made in the :hidden selector (for the videos page); this update should also hopefully improve some performance, but it is otherwise the same as before
Merge commit '
1aa2380c95a107842972f87ce1dfd7be9f859882'
* commit '
1aa2380c95a107842972f87ce1dfd7be9f859882':
AI 150428: update the jquery library to version 1.3.2.
Scott Main [Sat, 25 Jul 2009 17:12:04 +0000 (10:12 -0700)]
am
8576132a: AI 150393: edit the reference\'s navtree highlighting logic to handle intl/ directories BUG=
1790234
Merge commit '
8576132a38f4242c5f5da3133e832525a70766e6'
* commit '
8576132a38f4242c5f5da3133e832525a70766e6':
AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
Dirk Dougherty [Sat, 25 Jul 2009 17:12:03 +0000 (10:12 -0700)]
am
1cb43f69: AI 150389: Fix handling of cookie writes for intl pages. BUG=
1790234
Merge commit '
1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4'
* commit '
1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4':
AI 150389: Fix handling of cookie writes for intl pages.
Dirk Dougherty [Sat, 25 Jul 2009 17:12:01 +0000 (10:12 -0700)]
am
233bc0b8: AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this
Merge commit '
233bc0b84aef261a67a364ff3a8e91077fd70fd6'
* commit '
233bc0b84aef261a67a364ff3a8e91077fd70fd6':
AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).