Commit graph

866 commits

Author SHA1 Message Date
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
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
Mike Lockwood
f4dc5f07c0 cleanspec.mk: clean GPS related binaries.
Change-Id: I9717440f74a76b06e0128465234d588b26aa71a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-23 14:02:32 -04:00
Doug Zongker
27495d857c am 4b7dd3e3: Merge change 26017 into eclair
Merge commit '4b7dd3e36c949729464029480ca41753c122d7f0' into eclair-plus-aosp

* commit '4b7dd3e36c949729464029480ca41753c122d7f0':
  improve the OTA progress bar
2009-09-22 18:18:12 -07:00
Android (Google) Code Review
4b7dd3e36c Merge change 26017 into eclair
* changes:
  improve the OTA progress bar
2009-09-22 21:11:16 -04:00
Joe Onorato
e06a8a7de3 am c2211829: Merge change 26166 into eclair
Merge commit 'c2211829ac225786985d77a73049413022a65b71' into eclair-plus-aosp

* commit 'c2211829ac225786985d77a73049413022a65b71':
  Add a cleanspec entry for the VoiceSearch breakage that works.
2009-09-21 10:42:59 -07:00
Android (Google) Code Review
c2211829ac Merge change 26166 into eclair
* changes:
  Add a cleanspec entry for the VoiceSearch breakage that works.
2009-09-21 13:34:34 -04:00
Joe Onorato
79ece19f7a Add a cleanspec entry for the VoiceSearch breakage that works. 2009-09-21 13:34:04 -04:00
Hung-ying Tyan
670ddd61e0 am 849dbe85: Add CertInstaller app to generic product file.
Merge commit '849dbe85f2e1677627dda15c6c2dce790f169af2' into eclair-plus-aosp

* commit '849dbe85f2e1677627dda15c6c2dce790f169af2':
  Add CertInstaller app to generic product file.
2009-09-21 09:50:57 -07:00
Doug Zongker
881dd40ffb improve the OTA progress bar
Make the OTA progress bar advance a bit more smoothly by reallocating
how much is dedicated to various phases of incremental OTA
installation, based on some crude measurements of how long each phase
takes.
2009-09-20 14:03:55 -07:00
Hung-ying Tyan
849dbe85f2 Add CertInstaller app to generic product file. 2009-09-21 03:20:47 +08:00
Debajit Ghosh
5e36c1232d am 2492327c: fix broken incremental builds due to some voicesearch change.
Merge commit '2492327c9be4eb1f6761af963b2ca01b1af3b6a2' into eclair-plus-aosp

* commit '2492327c9be4eb1f6761af963b2ca01b1af3b6a2':
  fix broken incremental builds due to some voicesearch change.
2009-09-17 15:50:17 -07:00
Debajit Ghosh
2492327c9b fix broken incremental builds due to some voicesearch change. 2009-09-17 15:30:00 -07:00
Scott Main
b66f9b3e36 am 9958256b: am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '9958256b202e5ad5554bf91d4d77655662b31d5b' into eclair-plus-aosp

* commit '9958256b202e5ad5554bf91d4d77655662b31d5b':
  docs only.
2009-09-17 12:36:03 -07:00
Scott Main
9958256b20 am 1da82386: docs only. use normal DOM mod instead of jquery to load the lists.js file because jquery was appending GET parameters that eliminated any caching of the file.
Merge commit '1da823869ccbc5f848cdd35d52d1630886288446' into eclair

* commit '1da823869ccbc5f848cdd35d52d1630886288446':
  docs only.
2009-09-17 12:29:05 -07:00
Scott Main
1da823869c docs only.
use normal DOM mod instead of jquery to load the lists.js
file because jquery was appending GET parameters that
eliminated any caching of the file.

Change-Id: I926ef8c164ba81d040256accaf78883807c3b57e
2009-09-17 10:54:05 -07:00
Ben Murdoch
72f6e5ac9d am 1f030dcb: Update the cleanspec to clean libwebcore.
Merge commit '1f030dcba62978a8d81a84a5f26c36a2bbf79557' into eclair-plus-aosp

* commit '1f030dcba62978a8d81a84a5f26c36a2bbf79557':
  Update the cleanspec to clean libwebcore.
2009-09-17 08:48:38 -07:00
Ben Murdoch
1f030dcba6 Update the cleanspec to clean libwebcore.
Change-Id: Ie27e0e1c8a617199f1d8ff0b484936ccd14b04de
2009-09-17 11:29:36 +01:00
Dirk Dougherty
f2ffc36648 am 60bbe187: am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit '60bbe187da1e0b5aa753c3611e81cbb61f886599' into eclair-plus-aosp

* commit '60bbe187da1e0b5aa753c3611e81cbb61f886599':
  Change sdk doc template so that ADT download link bypasses clickthrough.
2009-09-16 11:30:41 -07:00
Dirk Dougherty
60bbe187da am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit 'c66c90a803ef256b5f945d10bd0ddd5abae15d64' into eclair

* commit 'c66c90a803ef256b5f945d10bd0ddd5abae15d64':
  Change sdk doc template so that ADT download link bypasses clickthrough.
2009-09-16 11:23:08 -07:00
Dirk Dougherty
c66c90a803 Change sdk doc template so that ADT download link bypasses clickthrough.
Change-Id: Ibea052b718f17043c992af7d5334b1c7e4fe2c6b
2009-09-16 10:11:01 -07:00
Xavier Ducrohet
8627291e99 am 502cf95a: am 743c1937: Merge change 24941 into donut
Merge commit '502cf95ad4cfa1ae9506bf5ad9c938532a5bb57e' into eclair-plus-aosp

* commit '502cf95ad4cfa1ae9506bf5ad9c938532a5bb57e':
  Add TTS files and Accessibility app to the SDK system image.
2009-09-15 13:47:17 -07:00
Mike Ritter
31d002062e am e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f' into eclair-plus-aosp

* commit 'e44fadeb49aac9d762f089ee2f23e4a4907a822f':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-09-15 13:45:42 -07:00
Doug Zongker
f1436ccdea am 353448c7: Merge change 24973 into eclair
Merge commit '353448c7b06847ac19a712439cebaee163a3e079' into eclair-plus-aosp

* commit '353448c7b06847ac19a712439cebaee163a3e079':
  increase reserved blocks from 5 to 8
2009-09-15 13:45:39 -07:00
Xavier Ducrohet
502cf95ad4 am 743c1937: Merge change 24941 into donut
Merge commit '743c19373a1c78bf2cc4d1c0dfd905e27ff598c6' into eclair

* commit '743c19373a1c78bf2cc4d1c0dfd905e27ff598c6':
  Add TTS files and Accessibility app to the SDK system image.
2009-09-15 13:18:52 -07:00
Mike Ritter
e44fadeb49 Bug in Mac build where it gets confused over case, fix no longer needed. 2009-09-15 11:18:31 -07:00
Doug Zongker
fe0602f60b increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching.  Take these all into account when
computing the max image size.
2009-09-14 18:08:45 -07:00
Android (Google) Code Review
353448c7b0 Merge change 24973 into eclair
* changes:
  increase reserved blocks from 5 to 8
2009-09-14 20:54:13 -04:00
Doug Zongker
93d9ff44ce increase reserved blocks from 5 to 8
Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching.  Take these all into account when
computing the max image size.
2009-09-14 17:46:41 -07:00
Android (Google) Code Review
743c19373a Merge change 24941 into donut
* changes:
  Add TTS files and Accessibility app to the SDK system image.
2009-09-14 18:41:50 -04:00
Xavier Ducrohet
1b6b32c277 Add TTS files and Accessibility app to the SDK system image. 2009-09-14 15:38:53 -07:00
Xavier Ducrohet
2f7cfd2a52 am be49598e: Merge change 24712 into eclair
Merge commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9' into eclair-plus-aosp

* commit 'be49598e2d7609e50eadd0dcba2190c01265c0a9':
  Fix CS templates to handle non-included classes.
2009-09-11 12:06:49 -07:00
Android (Google) Code Review
be49598e2d Merge change 24712 into eclair
* changes:
  Fix CS templates to handle non-included classes.
2009-09-11 14:58:54 -04:00
Xavier Ducrohet
63ec8e3b58 Fix CS templates to handle non-included classes.
This fix is to handle generate documentation not including base clases
(like java.* or android.*). Links to missing base classes must not be
created or they would point nowhere.

Change-Id: Ic591916fe9b6802903d894bd2cd3c45690533912
2009-09-11 11:14:00 -07:00
Scott Main
40a65ab4e6 am 5175caf6: am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '5175caf6eaab1b22c4cc1f352f22cd69d291a68e' into eclair-plus-aosp

* commit '5175caf6eaab1b22c4cc1f352f22cd69d291a68e':
  docs only.
2009-09-11 10:58:58 -07:00
Scott Main
5175caf6ea am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c' into eclair

* commit 'ded57160b406d5b253206cf5884ab9b33ac23b3c':
  docs only.
2009-09-11 10:49:26 -07:00
Scott Main
ded57160b4 docs only.
new donut image for compatibility with IE6 transparency issues

Change-Id: I444b09d7c5b211b3a07e7221ad96b3a7e4d989f7
2009-09-11 10:31:36 -07:00
Xavier Ducrohet
030df42844 am 85762123: Merge change 24584 into eclair
Merge commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83' into eclair-plus-aosp

* commit '857621233a13b28a31cbd6e0ae4e2df4eed44d83':
  Add support for @pending annotation.
2009-09-10 15:10:39 -07:00
Xavier Ducrohet
aca5e20e4a am a3c35d19: Merge change 24565 into eclair
Merge commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2' into eclair-plus-aosp

* commit 'a3c35d197ed533cabd90ac7d6dd309d50c8fdcb2':
  Add missing @Override to DroidDoc and ApiCheck
2009-09-10 15:10:36 -07:00
Android (Google) Code Review
857621233a Merge change 24584 into eclair
* changes:
  Add support for @pending annotation.
2009-09-10 18:03:47 -04:00
Android (Google) Code Review
a3c35d197e Merge change 24565 into eclair
* changes:
  Add missing @Override to DroidDoc and ApiCheck
2009-09-10 18:03:32 -04:00
Xavier Ducrohet
02e14df59f Add support for @pending annotation.
This behaves the same as @hide, but can be used to annotate API that are
only hidden pending API approval.

Change-Id: I4c0bf46c6d74ed45a8890ecdfd9b14ce234a5c18
2009-09-10 14:50:12 -07:00
Xavier Ducrohet
5ee390d856 Add missing @Override to DroidDoc and ApiCheck
Change-Id: Ic7829a4ea62a614ef8b525bd84f8fbaaa4674d06
2009-09-10 14:46:21 -07:00
Andy McFadden
42fe578dae am 2c86bfd2: Sleazy workaround for webkit build failures.
Merge commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c' into eclair-plus-aosp

* commit '2c86bfd285d8b3765da0144da31d1a3d216cb95c':
  Sleazy workaround for webkit build failures.
2009-09-10 10:45:25 -07:00
Andy McFadden
2c86bfd285 Sleazy workaround for webkit build failures.
The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.

This change truncates the "product" directory name to "pr", reducing the
command line by a few KB.  This only affects sim-eng builds.

The real fix will need be to webkit (see internal bug 1917987), which
will eventually start failing on device builds if it continues to grow.
2009-09-10 10:05:14 -07:00
Andrei Popescu
bf9b8e8904 am 270de928: Cleanstep required by switching back to JSC in the browser
Merge commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0' into eclair-plus-aosp

* commit '270de9284a56f1e9646afb1cf7e9f2720ddaa7b0':
  Cleanstep required by switching back to JSC in the browser
2009-09-08 13:39:46 -07:00
Andrei Popescu
270de9284a Cleanstep required by switching back to JSC in the browser 2009-09-08 19:47:22 +01:00