Commit Graph

1084 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 3ca0693894 am e93ece70: merge from open-source master
Merge commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb'

* commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb':
  Remove temporary vold logic
  added linux-sh.mk to support SuperH architecture
2009-10-14 16:16:46 -07:00
Jean-Baptiste Queru e93ece70a8 merge from open-source master 2009-10-14 16:02:08 -07:00
Jean-Baptiste Queru 2a11836482 merge from open-source master 2009-10-14 08:18:24 -07:00
Doug Zongker 690804c399 am 6ebf4436: Merge change I04432db5 into eclair-mr2
Merge commit '6ebf443631025b132f644bd349258192db4e3e9c'

* commit '6ebf443631025b132f644bd349258192db4e3e9c':
  use aapt to build jar files instead of the system zip
2009-10-13 17:10:34 -07:00
Raphael b54523bc00 am feec1ce3: am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'feec1ce3e01c93f43f425747df8073e9580d775a'

* commit 'feec1ce3e01c93f43f425747df8073e9580d775a':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 17:09:19 -07:00
Dan Bornstein fa477ba15e Allow WITH_JIT to be overridden in a custom buildspec.mk file.
Change-Id: I0fb7ffcfb9786f611e981d8f22f67a5ac8c9c405
2009-10-13 15:56:48 -07:00
Android (Google) Code Review 6ebf443631 Merge change I04432db5 into eclair-mr2
* changes:
  use aapt to build jar files instead of the system zip
2009-10-13 17:12:59 -04:00
Raphael 73186ceea2 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-plus-aosp

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 12:18:21 -07:00
Raphael feec1ce3e0 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 12:17:40 -07:00
Dianne Hackborn 3d967b873a am 3f7405e9: am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf'

* commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-13 12:12:03 -07:00
Brett Chabot 6592fe834d am 01c8ef9f: Merge commit \'1b3886b8\' into manualmerge
Merge commit '01c8ef9f5112ef6d6cf8801c722a62ceb7956d37'

* commit '01c8ef9f5112ef6d6cf8801c722a62ceb7956d37':
  Add speech tests to CTS makefile.
2009-10-13 11:59:59 -07:00
Brett Chabot 5ff0d2dd39 am e4e3a85f: Merge commit \'af6ccb69\' into manualmerge
Merge commit 'e4e3a85fae3f468d901922450a8da1fc89f7d702'

* commit 'e4e3a85fae3f468d901922450a8da1fc89f7d702':
  Add dpi tests to CTS.
2009-10-13 11:58:22 -07:00
Android (Google) Code Review dc54d239a2 Merge change I29b5b2d9
* changes:
  Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-13 11:51:30 -04:00
Raphael aa569862de Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
2009-10-12 16:16:02 -07:00
Sriram Raman ca02204ddb am 2bd9027d: Merge change I5bbd2294 into eclair-mr2
Merge commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183'

* commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183':
  For Ying Wang:
2009-10-12 12:42:05 -07:00
Doug Zongker 441dd2b016 am 160028f8: am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d'

* commit '160028f8325e9e1face3fc6f17baef498ee3e53d':
  move recovery image to the top of the OTA package
2009-10-12 12:40:19 -07:00
Jeff Hamilton 042ad44dd8 am ce017f01: am 979d5567: Merge change I6b350185 into eclair
Merge commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695'

* commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695':
  Add a cleanspec rule for the change to bump the API version to 5.
2009-10-12 12:31:01 -07:00
Joe Onorato a5ed6af74d am cb9102e0: am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'

* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-12 12:30:57 -07:00
Dianne Hackborn c2289d10cc am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-12 12:26:59 -07:00
Mike Ritter 8799ed2200 am ad37305e: am c51aa3bd: am 69625548: Merge change I239e9f26 into donut
Merge commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3'

* commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-10-12 11:43:13 -07:00
Brett Chabot 392bda6e09 am 66e0c458: Merge change I7bc67c51 into eclair-mr2
Merge commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d'

* commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d':
  Manual merge of donut-gms cts.mk changes.
2009-10-12 11:41:46 -07:00
Marco Nelissen a470587e5c am fb74a21f: am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'fb74a21f4792e08c1ebee5d0347698885e31d805'

* commit 'fb74a21f4792e08c1ebee5d0347698885e31d805':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-12 11:41:42 -07:00
Joe Onorato 523d6fa026 am f13231ef: am ea79e65f: Merge change Ib7704386 into eclair
Merge commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5'

* commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5':
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
2009-10-12 11:41:39 -07:00
Scott Main 67484da8a7 am b268d30a: am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289'

* commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289':
  docs only.
2009-10-12 11:41:10 -07:00
Doug Zongker 9e4374be2c use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
2009-10-09 12:14:03 -07:00
Gaurav Mathur 29b5b2d94f Add new tabs for Compatibility and Get Source to source.android.com framework 2009-10-08 23:54:35 -07:00
Dianne Hackborn 3f7405e994 am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-08 21:07:12 -07:00
Dianne Hackborn 2fbe759b11 am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-plus-aosp

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-08 21:06:51 -07:00
Dianne Hackborn ff6f3fe448 Finish issue #2168428: STOP SHIP: Bump API version to 5.
We are now 2.0.  Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
2009-10-08 20:50:27 -07:00
Brett Chabot 01c8ef9f51 Merge commit '1b3886b8' into manualmerge 2009-10-08 17:24:02 -07:00
Brett Chabot e4e3a85fae Merge commit 'af6ccb69' into manualmerge 2009-10-08 13:47:07 -07:00
Brett Chabot 4c1ab8f258 am 1b3886b8: am 45dc54f6: Add speech tests to CTS makefile.
Merge commit '1b3886b8485589438a86ccb5b9dbb9067da35627' into eclair-plus-aosp

* commit '1b3886b8485589438a86ccb5b9dbb9067da35627':
  Add speech tests to CTS makefile.
2009-10-08 11:19:00 -07:00
Brett Chabot ba30b3add9 am af6ccb69: am 30e1f2bd: Add dpi tests to CTS.
Merge commit 'af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4' into eclair-plus-aosp

* commit 'af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4':
  Add dpi tests to CTS.
2009-10-08 11:18:57 -07:00
Brett Chabot 1b3886b848 am 45dc54f6: Add speech tests to CTS makefile.
Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
  Add speech tests to CTS makefile.
2009-10-08 10:48:24 -07:00
Brett Chabot af6ccb69fe am 30e1f2bd: Add dpi tests to CTS.
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
  Add dpi tests to CTS.
2009-10-08 10:48:20 -07:00
Brett Chabot 45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00
Brett Chabot 30e1f2bdd8 Add dpi tests to CTS. 2009-10-08 10:00:37 -07:00
Android (Google) Code Review 2bd9027d0a Merge change I5bbd2294 into eclair-mr2
* changes:
  For Ying Wang:
2009-10-07 21:09:17 -04:00
Doug Zongker 160028f832 am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package
2009-10-07 17:19:28 -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
Sriram Raman 5bbd2294e9 For Ying Wang:
Fix "argument list too long" build error bug.
2009-10-07 16:27:38 -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
Jeff Hamilton d9e435e718 am 979d5567: Merge change I6b350185 into eclair
Merge commit '979d5567b72b4f3a8219b4786f9f512601645121' into eclair-plus-aosp

* commit '979d5567b72b4f3a8219b4786f9f512601645121':
  Add a cleanspec rule for the change to bump the API version to 5.
2009-10-07 12:02:43 -07:00
Joe Onorato 3c9342b99a am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-plus-aosp

* commit '0889661cd890e49a4827da0dc5d583274347d178':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-07 12:02:18 -07:00
Dianne Hackborn 2c2346fe7a am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-plus-aosp

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-07 11:59:56 -07:00
Mike Ritter 3390c4b3bc am c51aa3bd: am 69625548: Merge change I239e9f26 into donut
Merge commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-plus-aosp

* commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-10-07 11:54:56 -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
Joe Onorato bef29237b8 am ea79e65f: Merge change Ib7704386 into eclair
Merge commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-plus-aosp

* commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9':
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
2009-10-07 11:54:00 -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