Commit Graph

902 Commits

Author SHA1 Message Date
Ben Murdoch 3fadb8c0d0 resolved conflicts for merge of 72f6e5ac to master 2009-09-17 19:58:11 +01:00
Dirk Dougherty 107662f637 am f2ffc366: am 60bbe187: am c66c90a8: Change sdk doc template so that ADT download link bypasses clickthrough.
Merge commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288'

* commit 'f2ffc36648c5660846f8e8c173644e0b6b4e0288':
  Change sdk doc template so that ADT download link bypasses clickthrough.
2009-09-17 09:57:12 -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
Xavier Ducrohet 679367142b am 8627291e: am 502cf95a: am 743c1937: Merge change 24941 into donut
Merge commit '8627291e99397d9f453e15434a7d1160ece1878b'

* commit '8627291e99397d9f453e15434a7d1160ece1878b':
  Add TTS files and Accessibility app to the SDK system image.
2009-09-17 06:38:50 -07:00
Mike Ritter 2f37944a4a am 31d00206: am e44fadeb: Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit '31d002062e3735767401a26728e8bd5807095532'

* commit '31d002062e3735767401a26728e8bd5807095532':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-09-17 06:38:46 -07:00
Doug Zongker acc54d1067 am f1436ccd: am 353448c7: Merge change 24973 into eclair
Merge commit 'f1436ccdea1d63cb2a7345340929efcc4de8b7e9'

* commit 'f1436ccdea1d63cb2a7345340929efcc4de8b7e9':
  increase reserved blocks from 5 to 8
2009-09-17 06:38:43 -07:00
Doug Zongker aa7e606fc3 am fe0602f6: increase reserved blocks from 5 to 8
Merge commit 'fe0602f60b971c3b350d47115cba188cc67c7038'

* commit 'fe0602f60b971c3b350d47115cba188cc67c7038':
  increase reserved blocks from 5 to 8
2009-09-17 06:38:40 -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
Xavier Ducrohet c10001ea56 am 2f7cfd2a: am be49598e: Merge change 24712 into eclair
Merge commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97'

* commit '2f7cfd2a52d7ea17f08874f84eb2240854978e97':
  Fix CS templates to handle non-included classes.
2009-09-15 13:16:12 -07:00
Scott Main 352e8d79b9 am 40a65ab4: am 5175caf6: am ded57160: docs only. new donut image for compatibility with IE6 transparency issues
Merge commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9'

* commit '40a65ab4e6b71ad266bb29eb129283d6d709b7e9':
  docs only.
2009-09-15 13:14:16 -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 a4faa18b6f am 030df428: am 85762123: Merge change 24584 into eclair
Merge commit '030df428443735eed084286564407198792daa82'

* commit '030df428443735eed084286564407198792daa82':
  Add support for @pending annotation.
2009-09-10 15:19:55 -07:00
Xavier Ducrohet c35eaf7e98 am aca5e20e: am a3c35d19: Merge change 24565 into eclair
Merge commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea'

* commit 'aca5e20e4a47a943fc77c30b8cfafc62a1fb33ea':
  Add missing @Override to DroidDoc and ApiCheck
2009-09-10 15:19:51 -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 cae7d6735e am 42fe578d: am 2c86bfd2: Sleazy workaround for webkit build failures.
Merge commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf'

* commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf':
  Sleazy workaround for webkit build failures.
2009-09-10 10:55:03 -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
Ben Cheng db95cb4426 Enable Dalvik JIT by default for the master branch. 2009-09-09 13:03:44 -07:00
Andrei Popescu 03f9f2ee11 am bf9b8e89: am 270de928: Cleanstep required by switching back to JSC in the browser
Merge commit 'bf9b8e8904b930028adaf94c7139b714cef3d641'

* commit 'bf9b8e8904b930028adaf94c7139b714cef3d641':
  Cleanstep required by switching back to JSC in the browser
2009-09-08 15:59:59 -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
Jean-Baptiste Queru 8eb47bb13d am 6d547933: merge from open-source master
Merge commit '6d547933b8aa3a811499708bc8a4fea551599359'

* commit '6d547933b8aa3a811499708bc8a4fea551599359':
2009-09-04 11:06:01 -07:00
Jean-Baptiste Queru 6d547933b8 merge from open-source master 2009-09-04 07:50:42 -07:00
Mike Lockwood 451f14f769 am 356f7a2f: am 3e747ac3: Add clean step for /system/bin/bugreport symlink
Merge commit '356f7a2f15984e499f494f840a6ee0fb8e7826fe'

* commit '356f7a2f15984e499f494f840a6ee0fb8e7826fe':
  Add clean step for /system/bin/bugreport symlink
2009-09-03 14:24:31 -07:00
Mike Lockwood 356f7a2f15 am 3e747ac3: Add clean step for /system/bin/bugreport symlink
Merge commit '3e747ac3fe688c231bbf5591ee02226b394adf26' into eclair-plus-aosp

* commit '3e747ac3fe688c231bbf5591ee02226b394adf26':
  Add clean step for /system/bin/bugreport symlink
2009-09-03 14:21:50 -07:00
Jean-Baptiste Queru dc785843c7 merge from donut 2009-09-03 14:12:45 -07:00
Mike Lockwood 3e747ac3fe Add clean step for /system/bin/bugreport symlink
Change-Id: Ib2abb22184b16b6b3c5bc0e38141922f3fcbfca0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-03 15:01:07 -04:00