Commit graph

397 commits

Author SHA1 Message Date
Dirk Dougherty
daeda811ab am f03f574a: am 3d3d7b7e: doc change: template changes for new SDK doc structure.
Merge commit 'f03f574a021e412b2060116c1112b62b4c21c2fe' into eclair-plus-aosp

* commit 'f03f574a021e412b2060116c1112b62b4c21c2fe':
  doc change: template changes for new SDK doc structure.
2009-10-22 11:31:15 -07:00
Dirk Dougherty
db02360018 am 51da2c57: am fce6b45f: doc change: template/asset changes for sdk package.
Merge commit '51da2c573d945d17890e519e7e26a89b2d2f7b51' into eclair-plus-aosp

* commit '51da2c573d945d17890e519e7e26a89b2d2f7b51':
  doc change: template/asset changes for sdk package.
2009-10-22 11:31:11 -07:00
Dirk Dougherty
3d3d7b7efd doc change: template changes for new SDK doc structure.
Bug:2160782
2009-10-21 19:52:52 -07:00
Dirk Dougherty
fce6b45f62 doc change: template/asset changes for sdk package. 2009-10-16 17:14:33 -07:00
Doug Zongker
7484d0e04a am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-plus-aosp

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package
2009-10-07 17:17:45 -07:00
Doug Zongker
f2b32f2a4b resolved conflicts for merge of cfd7db6d to eclair 2009-10-07 17:05:36 -07:00
Doug Zongker
cfd7db6d84 move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
2009-10-07 16:26:00 -07:00
Marco Nelissen
7c6d0c2e9e am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-plus-aosp

* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-07 11:54:04 -07:00
Scott Main
6eeedf0124 am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-plus-aosp

* commit '5f0241f5d8da1db2721c19d7629115a6c1c71639':
  docs only.
2009-10-07 11:53:41 -07:00
Android (Google) Code Review
69625548bf Merge change I239e9f26 into donut
* changes:
  Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit e44fadeb49)
2009-10-06 14:36:51 -04:00
Android (Google) Code Review
f885d876a2 Merge change I2bdc7ec9 into eclair
* changes:
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 13:48:38 -04:00
Scott Main
5f0241f5d8 am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair

* commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
  docs only.
2009-10-06 10:14:01 -07:00
Scott Main
37bfad5ce8 docs only.
fix FF2 browser bug in header layout

http://b/2031559

Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
2009-10-06 09:27:10 -07:00
Scott Main
95035daffb am 39715e2f: Merge change I962d468d into eclair
Merge commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp

* commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
  revise the deprecated warning to use the 'caution'
2009-09-30 15:33:55 -07:00
Android (Google) Code Review
39715e2f3d Merge change I962d468d into eclair
* changes:
  revise the deprecated warning to use the 'caution' style and add a line break
2009-09-30 18:23:08 -04:00
Scott Main
962d468d73 revise the deprecated warning to use the 'caution'
style and add a line break
2009-09-30 14:37:32 -07:00
Mike Ritter
239e9f2671 Bug in Mac build where it gets confused over case, fix no longer needed.
(cherry picked from commit e44fadeb49)
2009-09-30 12:09:19 -07:00
Dirk Dougherty
8fd5fb34ab am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut
Merge commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp

* commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
  Add NDK version reference to template.
2009-09-30 11:43:32 -07:00
Dirk Dougherty
96dcc3a98e am 7259bae0: Merge change Ied94685e into donut
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair

* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
  Add NDK version reference to template.
2009-09-30 11:32:09 -07:00
Doug Zongker
da2d06bb1c am c18736b1: remember device-specific releasetools extensions in target-files
Merge commit 'c18736b1a777c386dc3c5e3f878249770b5edd78' into eclair-plus-aosp

* commit 'c18736b1a777c386dc3c5e3f878249770b5edd78':
  remember device-specific releasetools extensions in target-files
2009-09-30 10:18:57 -07:00
Doug Zongker
c18736b1a7 remember device-specific releasetools extensions in target-files
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
2009-09-30 09:20:32 -07:00
Andy McFadden
27c6f996e9 am c3c136c4: Merge change I95ed76bd into eclair
Merge commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f' into eclair-plus-aosp

* commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f':
  Update usage and readme for zipalign.
2009-09-29 11:41:46 -07:00
Android (Google) Code Review
c3c136c4cd Merge change I95ed76bd into eclair
* changes:
  Update usage and readme for zipalign.
2009-09-29 14:31:43 -04:00
Andy McFadden
95ed76bd3e Update usage and readme for zipalign.
Added the "-c" flag to the README, and added a short description of the
flag meanings to the usage output.  Threw in an AOSP copyright one-liner
for good measure.
2009-09-29 10:55:32 -07:00
Marco Nelissen
2bdc7ec9cf Speed up warn.py about 30x by precompiling all the regular expressions. 2009-09-29 10:19:29 -07:00
Android (Google) Code Review
7259bae08d Merge change Ied94685e into donut
* changes:
  Add NDK version reference to template.
2009-09-29 11:43:24 -04:00
Doug Zongker
2499b8d780 am 481c4e65: fix python syntax error
Merge commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d' into eclair-plus-aosp

* commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d':
  fix python syntax error
2009-09-28 10:20:34 -07:00
Doug Zongker
481c4e650f fix python syntax error 2009-09-28 10:07:13 -07:00
Jeff Hamilton
f568c602b5 am d85472a7: Fix the build. imgdiff.c needed #include <sys/types.h>.
Merge commit 'd85472a7461d0daeb7e17a6f0a7c56f37a2335bc' into eclair-plus-aosp

* commit 'd85472a7461d0daeb7e17a6f0a7c56f37a2335bc':
  Fix the build. imgdiff.c needed #include <sys/types.h>.
2009-09-25 20:51:36 -07:00
Jeff Hamilton
d85472a746 Fix the build. imgdiff.c needed #include <sys/types.h>.
Change-Id: I82169a926e7df2aa92bac2c4f427bc64f4811362
2009-09-25 21:47:52 -05:00
Doug Zongker
92247b3893 am 7f116185: add missing include directory
Merge commit '7f116185cc254653f9f7abd572d2619d5ddc6f04' into eclair-plus-aosp

* commit '7f116185cc254653f9f7abd572d2619d5ddc6f04':
  add missing include directory
2009-09-25 17:13:36 -07:00
Doug Zongker
7f116185cc add missing include directory
Should have been in change Id98e0870 (though it builds on my machine
even without this...)
2009-09-25 17:02:20 -07:00
Doug Zongker
a785cb55aa am 2bd8abc7: Merge change 27088 into eclair
Merge commit '2bd8abc7c676b28bc34294f6b0be28d98520029f' into eclair-plus-aosp

* commit '2bd8abc7c676b28bc34294f6b0be28d98520029f':
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-25 16:52:11 -07:00
Android (Google) Code Review
2bd8abc7c6 Merge change 27088 into eclair
* changes:
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-25 19:43:55 -04:00
Scott Main
dfa9bc7ab1 am 6159eead: am afdb6feb: Merge change 27127 into donut
Merge commit '6159eead22482c46151b9da077bf2fb8bdad1dbc' into eclair-plus-aosp

* commit '6159eead22482c46151b9da077bf2fb8bdad1dbc':
  docs only.
2009-09-25 15:10:33 -07:00
Scott Main
6159eead22 am afdb6feb: Merge change 27127 into donut
Merge commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba' into eclair

* commit 'afdb6feb9b5051f93cecb7fca77cc4a2b3a702ba':
  docs only.
2009-09-25 15:00:40 -07:00
Android (Google) Code Review
afdb6feb9b Merge change 27127 into donut
* changes:
  docs only. inherit the line height to resolve vertical scroll issue in WebKit browsers
2009-09-25 17:48:11 -04:00
Scott Main
18a4883ab3 docs only.
inherit the line height to resolve vertical scroll
issue in WebKit browsers

Change-Id: I1707893614e3983e6b53a31229b3e19e584d6950
2009-09-25 14:38:33 -07:00
Doug Zongker
f78bee7494 am ea4a3fa3: Merge change 27066 into eclair
Merge commit 'ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca' into eclair-plus-aosp

* commit 'ea4a3fa3d4b027dc4873dc4248983f27cd0bdbca':
  parallellize computation of binary patches
2009-09-25 12:50:46 -07:00
Android (Google) Code Review
ea4a3fa3d4 Merge change 27066 into eclair
* changes:
  parallellize computation of binary patches
2009-09-25 15:40:43 -04:00
Doug Zongker
761e642d54 parallellize computation of binary patches
Change ota_from_target_files to compute binary patches for all the
changed files in the OTA package in parallel.  On a recent test build
this cuts incremental construction time roughly in half (6 min to 2
min 40 sec).
2009-09-25 12:35:11 -07:00
Doug Zongker
d98e087042 integrate bsdiff into imgdiff, instead of using subprocess
Integrate the bsdiff code into imgdiff so we can just call it rather
than writing temp files and invoking bsdiff as a subprocess.  When
computing multiple patches from the same source file, we can also save
time by doing some bsdiff preprocessing on the source file only once.

(Note this renames the existing 'bsdiff.c' -- which actually does
patching in applypatch -- to 'bspatch.c', and introduces a new
bsdiff.c linked into imgdiff.)
2009-09-25 11:52:00 -07:00
Scott Main
93c80c4f07 am 0c44a2a9: am ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit '0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c' into eclair-plus-aosp

* commit '0c44a2a9f3fb4a6be94bfaa4f00cbccca1dbb57c':
  adds a parameter to the URL hash on all search queries.
2009-09-25 09:23:38 -07:00
Scott Main
0c44a2a9f3 am ad4d4efa: adds a parameter to the URL hash on all search queries. depends on change 3583, in order to handle the new parameter
Merge commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5' into eclair

* commit 'ad4d4efac403eeba5d648f172aca46c3ad7962c5':
  adds a parameter to the URL hash on all search queries.
2009-09-25 09:15:00 -07:00
Scott Main
ad4d4efac4 adds a parameter to the URL hash on all search queries.
depends on change 3583, in order to handle the new parameter

Change-Id: I86ead029371615243cfd809bd7cb2a2f2830c4be
2009-09-24 20:41:29 -07:00
Scott Main
207ce1fce5 am b91916b4: docs only. change the SDK tab to point to the release notes in offline mode; hide all other languages by default instead of depending on the stylesheet
Merge commit 'b91916b414b3c4ef3ec68bec9e84694d03a15331' into eclair-plus-aosp

* commit 'b91916b414b3c4ef3ec68bec9e84694d03a15331':
  docs only.
2009-09-24 20:19:17 -07:00
Scott Main
b91916b414 docs only.
change the SDK tab to point to the release notes in offline mode;
hide all other languages by default instead of
depending on the stylesheet
2009-09-24 19:50:56 -07:00
Scott Main
4dc826b75c am 389cdb7a: Merge change 26258 into eclair
Merge commit '389cdb7ab60182292fe383bc1c29d7b77ca5a893' into eclair-plus-aosp

* commit '389cdb7ab60182292fe383bc1c29d7b77ca5a893':
  docs only.
2009-09-24 14:01:36 -07:00
Android (Google) Code Review
389cdb7ab6 Merge change 26258 into eclair
* changes:
  docs only. remove Home tab from offline docs and make SDK tab point to new offline welcome page; hide all other languages by default instead of depending on the stylesheet
2009-09-24 16:50:31 -04:00
David 'Digit' Turner
d9a8e1b309 am ef453a51: Fix ARMv7 -user builds
Merge commit 'ef453a51f58713bfa31c13f5e66596b3d5752049' into eclair-plus-aosp

* commit 'ef453a51f58713bfa31c13f5e66596b3d5752049':
  Fix ARMv7 -user builds
2009-09-23 21:41:07 -07:00