Commit Graph

3000 Commits

Author SHA1 Message Date
Dirk Dougherty
9e85734425 am 724735d2: am 6f7ba2dc: Merge change 20234 into donut
Merge commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b'

* commit '724735d2be4dd75207e53dff752feb6bd3a9dd6b':
  Remove extraneous quotation mark in template file
2009-08-20 10:41:02 -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
Scott Main
aeb8fd7ee1 am f036631b: 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 'f036631b02bca65818cc02767c5389e5de1f67a8'

* commit 'f036631b02bca65818cc02767c5389e5de1f67a8':
  DOCS ONLY.
2009-08-19 12:16:10 -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
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
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
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
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
Gaurav Mathur
ab28cea58d Frame-work for open source site
modified:   customization.cs
2009-08-11 22:24:15 -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
Joe Onorato
4820a945a5 dedup findleaves output 2009-08-07 11:19:50 -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
Joe Onorato
dc1a728fb8 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
2009-08-06 12:09:21 -07:00
Scott Main
66a3d6dced am 95641e97: fix css image references for offline docs
Merge commit '95641e9759b74fe61ff138970ca8aa2a9f34a080'

* commit '95641e9759b74fe61ff138970ca8aa2a9f34a080':
  fix css image references for offline docs
2009-08-06 02:45:17 -07:00
Scott Main
95641e9759 fix css image references for offline docs 2009-08-06 02:36:50 -07:00
Scott Main
7a09cd61de am fa4765e0: lighten up on "preliminary" watermark
Merge commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80'

* commit 'fa4765e0dc46af4d131fc9e914e114b4f59d4a80':
  lighten up on "preliminary" watermark
2009-08-05 23:43:15 -07:00
Scott Main
fa4765e0dc lighten up on "preliminary" watermark 2009-08-05 23:39:08 -07:00
Android (Google) Code Review
af8a3139ca am 11be8c3e: Merge change 20232 into donut
Merge commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8'

* commit '11be8c3e5f2fd950b14bd17af9b67c25a15970f8':
  Fix broken url in offline preview docs
2009-08-05 22:11:37 -07:00
Android (Google) Code Review
11be8c3e5f Merge change 20232 into donut
* changes:
  Fix broken url in offline preview docs
2009-08-05 22:09:17 -07:00
Android (Google) Code Review
cce4bb5c45 am 89e555f3: Merge change 20222 into donut
Merge commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa'

* commit '89e555f3c5ccb44f15995d5d59854c4e0f9450fa':
  Add support for preview SDK handling in doc templates.
2009-08-05 20:46:45 -07:00
Android (Google) Code Review
89e555f3c5 Merge change 20222 into donut
* changes:
  Add support for preview SDK handling in doc templates.
2009-08-05 20:44:28 -07:00
Dirk Dougherty
71904aa403 Remove extraneous quotation mark in template file
Bug: 2031559
2009-08-05 20:35:31 -07:00
Dirk Dougherty
0931432790 Fix broken url in offline preview docs
Bug: 2031159
2009-08-05 20:19:16 -07:00
Dirk Dougherty
82a28818f5 Add support for preview SDK handling in doc templates.
Bug: 2031559
2009-08-05 19:09:16 -07:00
Android (Google) Code Review
007294e261 am 28ab3b12: Merge change 8917 into donut
Merge commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9'

* commit '28ab3b12d38f1e613d92fcee251ef064665dd8c9':
  implement api level toggling
2009-08-05 12:01:29 -07:00
Android (Google) Code Review
28ab3b12d3 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.
2009-08-05 11:55:54 -07:00
Scott Main
25fda19689 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.
2009-08-05 10:43:55 -07:00
Doug Zongker
1218b09012 am 1aca962a: allow for malformed imagesizes.txt
Merge commit '1aca962af153d6437937e3e687740d2c1c12657d'

* commit '1aca962af153d6437937e3e687740d2c1c12657d':
  allow for malformed imagesizes.txt
2009-08-04 15:14:01 -07:00
Doug Zongker
1aca962af1 allow for malformed imagesizes.txt
Some builds have blank values for max image sizes; ignore these lines.
2009-08-04 15:09:27 -07:00
Android (Google) Code Review
7d7630cca8 am b6153173: Merge change 9605 into donut
Merge commit 'b6153173952895441e55d0ff6be332bb7c7605e2'

* commit 'b6153173952895441e55d0ff6be332bb7c7605e2':
  use the max image sizes from the target files zip
2009-08-04 14:16:38 -07:00
Android (Google) Code Review
b615317395 Merge change 9605 into donut
* changes:
  use the max image sizes from the target files zip
2009-08-04 14:11:15 -07:00
Doug Zongker
fdd8e69c42 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.
2009-08-03 17:27:48 -07:00
Doug Zongker
e8cb956b8a am 828bbfb1: in amend, remove symlink targets before creating them
Merge commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c'

* commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c':
  in amend, remove symlink targets before creating them
2009-08-03 16:55:57 -07:00
Doug Zongker
828bbfb188 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
2009-08-03 14:11:09 -07:00
Jean-Baptiste Queru
123f82cb0b merge from donut 2009-08-03 07:50:30 -07:00
Marco Nelissen
5236fbde30 Update warn.py with the latest warnings that popped up in the build. 2009-07-31 09:02:11 -07:00
Android (Google) Code Review
1951d0eed9 am 7ebafd5a: Merge change 9009 into donut
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'

* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-30 06:56:59 -07:00
Scott Main
a7f49e3b95 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....
2009-07-29 16:44:56 -07:00
Jean-Baptiste Queru
7227ea7619 merge from donut 2009-07-29 14:56:48 -07:00
Android (Google) Code Review
7ebafd5aa0 Merge change 9009 into donut
* changes:
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-29 13:58:07 -07:00
Dirk Dougherty
3b1ee3789c Reapply modifications from 3175 to fix display of navTree in doc output. 2009-07-29 12:25:44 -07:00
Jean-Baptiste Queru
239637eac8 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
2009-07-29 07:35:15 -07:00
Scott Main
df09424f19 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.
2009-07-28 09:53:59 -07:00
Jean-Baptiste Queru
7c07cf9a82 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
2009-07-25 16:58:22 -07:00