Commit Graph

983 Commits

Author SHA1 Message Date
Andy McFadden
d5c079ee27 am 27c6f996: am c3c136c4: Merge change I95ed76bd into eclair
Merge commit '27c6f996e9636d6af27a72c4817d082151bc1dea'

* commit '27c6f996e9636d6af27a72c4817d082151bc1dea':
  Update usage and readme for zipalign.
2009-10-01 11:17:31 -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
Dave Sparks
ae5b51c439 am 4b71f80a: am 55ad5cc3: Change default notification to OnTheHunt. Bug 2146688.
Merge commit '4b71f80a1fdb464ec45bad4e5ed93bda4587118c'

* commit '4b71f80a1fdb464ec45bad4e5ed93bda4587118c':
  Change default notification to OnTheHunt. Bug 2146688.
2009-09-29 11:13:45 -07:00
Nick Pelly
cc1d470e68 am 6cfd4351: am dfb05e7a: cleanspek for Bluetooth API change.
Merge commit '6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324'

* commit '6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324':
  cleanspek for Bluetooth API change.
2009-09-29 11:08:37 -07: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
Dave Sparks
4b71f80a1f am 55ad5cc3: Change default notification to OnTheHunt. Bug 2146688.
Merge commit '55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea' into eclair-plus-aosp

* commit '55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea':
  Change default notification to OnTheHunt. Bug 2146688.
2009-09-28 17:43:48 -07:00
Dave Sparks
55ad5cc3e6 Change default notification to OnTheHunt. Bug 2146688. 2009-09-28 17:27:32 -07:00
Nick Pelly
6cfd4351bb am dfb05e7a: cleanspek for Bluetooth API change.
Merge commit 'dfb05e7a16a98844e4f47d707193fe05f1d3fc13' into eclair-plus-aosp

* commit 'dfb05e7a16a98844e4f47d707193fe05f1d3fc13':
  cleanspek for Bluetooth API change.
2009-09-28 13:55:23 -07:00
Nick Pelly
dfb05e7a16 cleanspek for Bluetooth API change.
Change-Id: I3bc628b4dae7757aa616f09a69e6c0f6612b7f87
2009-09-28 13:34:07 -07:00
Doug Zongker
7a6f198727 am 2499b8d7: am 481c4e65: fix python syntax error
Merge commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c'

* commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c':
  fix python syntax error
2009-09-28 10:31:10 -07: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
8206868b32 am f568c602: am d85472a7: Fix the build. imgdiff.c needed #include <sys/types.h>.
Merge commit 'f568c602b5726d4212d3e8712b6b13ff3e5230e5'

* commit 'f568c602b5726d4212d3e8712b6b13ff3e5230e5':
  Fix the build. imgdiff.c needed #include <sys/types.h>.
2009-09-28 01:06:35 -07:00
Doug Zongker
1a008b6c31 am 92247b38: am 7f116185: add missing include directory
Merge commit '92247b3893abca1de15a564592b891be493f9d35'

* commit '92247b3893abca1de15a564592b891be493f9d35':
  add missing include directory
2009-09-27 15:42:51 -07:00
Doug Zongker
8c5b435698 am a785cb55: am 2bd8abc7: Merge change 27088 into eclair
Merge commit 'a785cb55aa40c4bd251a528edb169d6e1a865169'

* commit 'a785cb55aa40c4bd251a528edb169d6e1a865169':
  integrate bsdiff into imgdiff, instead of using subprocess
2009-09-27 15:42:34 -07:00
Scott Main
249be1036a am dfa9bc7a: am 6159eead: am afdb6feb: Merge change 27127 into donut
Merge commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c'

* commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c':
  docs only.
2009-09-27 15:40:02 -07:00
Doug Zongker
b138371377 am f78bee74: am ea4a3fa3: Merge change 27066 into eclair
Merge commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6'

* commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6':
  parallellize computation of binary patches
2009-09-27 15:36:37 -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
20bd674021 am 93c80c4f: 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 '93c80c4f073811a8fab78e8b56fc2eef87aa0707'

* commit '93c80c4f073811a8fab78e8b56fc2eef87aa0707':
  adds a parameter to the URL hash on all search queries.
2009-09-25 11:25:14 -07:00
Scott Main
46a39b74a7 am 207ce1fc: 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 '207ce1fce5099ac7da18c28f63519d6103a1db32'

* commit '207ce1fce5099ac7da18c28f63519d6103a1db32':
  docs only.
2009-09-25 11:16:38 -07:00
Ed Heyl
36b28ce933 am c7e20322: (-s ours) am 8392b831: Merge change 25632 into eclair
Merge commit 'c7e203226dcd537ff014d71fb0923750352838aa'

* commit 'c7e203226dcd537ff014d71fb0923750352838aa':
  Set default build ID to eclair (usually this is overridden).  Please do not merge.
2009-09-25 11:15:23 -07:00
Scott Main
1e7ee1a568 am 4dc826b7: am 389cdb7a: Merge change 26258 into eclair
Merge commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7'

* commit '4dc826b75c0543a9b7539f3e341fd6552f9f95f7':
  docs only.
2009-09-25 11:10:25 -07:00
Joe Onorato
dea0b8c5ea am 4ff55ba0: am e62902c9: Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Merge commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2'

* commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2':
  Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
2009-09-25 11:04:55 -07:00
Joe Onorato
cc9417720b am 73270d49: am f88d14c1: Cleanspec entry for the old launcher on
Merge commit '73270d49e0716dae7d59b7e0475a53b85f970576'

* commit '73270d49e0716dae7d59b7e0475a53b85f970576':
  Cleanspec entry for the old launcher on
2009-09-25 11:04:51 -07:00
David 'Digit' Turner
085603258c am d9a8e1b3: am ef453a51: Fix ARMv7 -user builds
Merge commit 'd9a8e1b30961392bc818467ae526f6cca35ced8d'

* commit 'd9a8e1b30961392bc818467ae526f6cca35ced8d':
  Fix ARMv7 -user builds
2009-09-25 10:59:31 -07:00
Dave Bort
0a71aacfff am 9db1fc2b: am b392641d: Make fail if it\'s called after including
Merge commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2'

* commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2':
  Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
2009-09-25 10:51:31 -07:00
Mike Lockwood
d4c2476829 am 1c418073: am f4dc5f07: cleanspec.mk: clean GPS related binaries.
Merge commit '1c4180738249a582a1b3f7c39f6d9f81c9c6f78d'

* commit '1c4180738249a582a1b3f7c39f6d9f81c9c6f78d':
  cleanspec.mk: clean GPS related binaries.
2009-09-25 10:51:28 -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
Doug Zongker
d2941cffe1 am 27495d85: am 4b7dd3e3: Merge change 26017 into eclair
Merge commit '27495d857c505753ad834b3cfdc312902e1c3919'

* commit '27495d857c505753ad834b3cfdc312902e1c3919':
  improve the OTA progress bar
2009-09-25 08:45:37 -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
Ed Heyl
c7e203226d am 8392b831: Merge change 25632 into eclair
Merge commit '8392b83176f4090c9d7b9b4c90505bac1d280c79' into eclair-plus-aosp

* commit '8392b83176f4090c9d7b9b4c90505bac1d280c79':
  Set default build ID to eclair (usually this is overridden).  Please do not merge.
2009-09-24 17:29:09 -07:00
Android (Google) Code Review
8392b83176 Merge change 25632 into eclair
* changes:
  Set default build ID to eclair (usually this is overridden).  Please do not merge.
2009-09-24 20:20:48 -04: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