Commit Graph

86485 Commits

Author SHA1 Message Date
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
android-build SharedAccount
415febfb00 ERC87 2009-09-25 09:39:48 -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
android-build SharedAccount
a2925c4dd0 ERC86D 2009-09-24 16:08:50 -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
The Android Open Source Project
c6e3be0515 ERC86C 2009-09-24 12:22:59 -07:00
The Android Open Source Project
092e344eae ERC86B 2009-09-24 11:36:59 -07:00
The Android Open Source Project
cd6244f20c Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-24 11:36:50 -07:00
Joe Onorato
4ff55ba0c7 am e62902c9: Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
Merge commit 'e62902c95b3b6f876ffafa5595396b25e7bd2395' into eclair-plus-aosp

* commit 'e62902c95b3b6f876ffafa5595396b25e7bd2395':
  Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
2009-09-24 09:39:50 -07:00
Joe Onorato
73270d49e0 am f88d14c1: Cleanspec entry for the old launcher on
Merge commit 'f88d14c16ff7f3f6a35f7967c37fe88c28020b46' into eclair-plus-aosp

* commit 'f88d14c16ff7f3f6a35f7967c37fe88c28020b46':
  Cleanspec entry for the old launcher on
2009-09-24 09:39:46 -07:00
Joe Onorato
e62902c95b Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references 2009-09-24 09:27:35 -07:00
Joe Onorato
f88d14c16f Cleanspec entry for the old launcher on 2009-09-24 09:27:35 -07:00
The Android Open Source Project
4b28775460 ERC86 2009-09-24 08:37:10 -07:00
The Android Open Source Project
07c0c9ef7e Merge commit 'remotes/goog/eclair' into eclair-release 2009-09-24 08:36:57 -07: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
David 'Digit' Turner
ef453a51f5 Fix ARMv7 -user builds
Allow the dex preoptimization pass for ARMv7 system images to use the
ARMv7-specific kernel image. This is needed to fix the -user builds that
absolutely depend on running the dex preopt in the emulator.

This will hopefully be removed when we'll be able to perform the dex
preopt on the host instead.
2009-09-23 18:48:16 -07:00
Dirk Dougherty
5c450ed169 Add NDK version reference to template.
Change-Id: Ied94685e7c8dde2eab4f708d30cbf2757cea10d5
2009-09-23 17:31:16 -07:00
Dave Bort
9db1fc2bea am b392641d: Make fail if it\'s called after including
Merge commit 'b392641d9b07d6321aed828c983af04115da8aab' into eclair-plus-aosp

* commit 'b392641d9b07d6321aed828c983af04115da8aab':
  Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
2009-09-23 13:31:07 -07:00
Mike Lockwood
1c41807382 am f4dc5f07: cleanspec.mk: clean GPS related binaries.
Merge commit 'f4dc5f07c0c46a7439bead7379a0846ac0c122b0' into eclair-plus-aosp

* commit 'f4dc5f07c0c46a7439bead7379a0846ac0c122b0':
  cleanspec.mk: clean GPS related binaries.
2009-09-23 13:31:04 -07:00
Dave Bort
b392641d9b Make $(my-dir) fail if it's called after including $(CLEAR_VARS) 2009-09-23 12:58:20 -07:00