OSDN Git Service

android-x86/build.git
13 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 23 Jun 2011 13:44:44 +0000 (06:44 -0700)]
merge in ics-release history after reset to master

13 years agoMerge "Use the host STL for host native test."
Ying Wang [Wed, 22 Jun 2011 23:37:12 +0000 (16:37 -0700)]
Merge "Use the host STL for host native test."

13 years agoIRJ83B
The Android Automerger [Wed, 22 Jun 2011 23:27:32 +0000 (16:27 -0700)]
IRJ83B

Change-Id: I312f1d472f2f81c4d2cab1757ea6af393cb731d2

13 years agoUse the host STL for host native test.
Ying Wang [Wed, 22 Jun 2011 23:01:48 +0000 (16:01 -0700)]
Use the host STL for host native test.

Bug: 4584343
Change-Id: I420b7d955142d57993295cec12e54c94d5a75b88

13 years agoIRJ83
The Android Automerger [Wed, 22 Jun 2011 13:48:53 +0000 (06:48 -0700)]
IRJ83

Change-Id: I22594d1c9a8803af8df14736b9d18e5835d7b023

13 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 22 Jun 2011 13:48:39 +0000 (06:48 -0700)]
merge in ics-release history after reset to master

13 years agoRevert mistakenly committed debug statement.
Brett Chabot [Wed, 22 Jun 2011 05:25:01 +0000 (22:25 -0700)]
Revert mistakenly committed debug statement.

Change-Id: Iee6369002ba984821c889c7c0a92db061dc21355

13 years agoam 1c5df439: am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator...
David 'Digit' Turner [Tue, 21 Jun 2011 22:27:10 +0000 (15:27 -0700)]
am 1c5df439: am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"

* commit '1c5df4396b581df771212ffad891e970702f97c9':
  emulator: Build emulator platform images as ARMv7-A

13 years agoam 2feecf6f: am cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink...
Jean-Baptiste Queru [Tue, 21 Jun 2011 22:24:48 +0000 (15:24 -0700)]
am 2feecf6f: am cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"

* commit '2feecf6f379438c2e8ebc4c270ad9e4d62f6c37c':
  Tweak prelink map even more

13 years agoIRJ82B
The Android Automerger [Tue, 21 Jun 2011 21:41:17 +0000 (14:41 -0700)]
IRJ82B

Change-Id: Ic9c2334ededc6c4f8a81d2d9721939772226f5cf

13 years agoam 2a85de6d: am ea54b50e: am f3659c8b: am 36c1f10d: Merge "Relax the constraint of...
Jean-Baptiste Queru [Tue, 21 Jun 2011 20:45:43 +0000 (13:45 -0700)]
am 2a85de6d: am ea54b50e: am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."

* commit '2a85de6d44c2969f1093486ad09ea94098dc8577':
  Relax the constraint of 64bit build environment.

13 years agoam 4a9dd2dc: am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink...
Jean-Baptiste Queru [Tue, 21 Jun 2011 20:45:36 +0000 (13:45 -0700)]
am 4a9dd2dc: am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit '4a9dd2dc4a22d900d7d5d9dc5f8f9f27c3f3b871':
  Tweak prelink map

13 years agoMerge "Add layoutlib-tests to sdk build."
Brett Chabot [Tue, 21 Jun 2011 18:27:24 +0000 (11:27 -0700)]
Merge "Add layoutlib-tests to sdk build."

13 years agoIRJ82
The Android Automerger [Tue, 21 Jun 2011 13:45:39 +0000 (06:45 -0700)]
IRJ82

Change-Id: I0ddca288adbcbcf561b7a6b05596f16b8e20ee82

13 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 21 Jun 2011 13:45:30 +0000 (06:45 -0700)]
merge in ics-release history after reset to master

13 years agoIRJ81B
The Android Automerger [Mon, 20 Jun 2011 20:29:48 +0000 (13:29 -0700)]
IRJ81B

Change-Id: Ia6e2f4c64f036df34bcc4f0b11258f8c05cde42b

13 years agoMerge "Expand the full languages list to include the new locales."
Eric Fischer [Mon, 20 Jun 2011 19:02:46 +0000 (12:02 -0700)]
Merge "Expand the full languages list to include the new locales."

13 years agoMerge "Uniq the system properties."
Ying Wang [Mon, 20 Jun 2011 18:05:27 +0000 (11:05 -0700)]
Merge "Uniq the system properties."

13 years agoam 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform image...
David 'Digit' Turner [Mon, 20 Jun 2011 16:10:58 +0000 (09:10 -0700)]
am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"

* commit '4f9479bfdbc38e9bc06a5cf0a4bf67214fb358a8':
  emulator: Build emulator platform images as ARMv7-A

13 years agoam 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
David 'Digit' Turner [Mon, 20 Jun 2011 16:04:39 +0000 (09:04 -0700)]
am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"

* commit '683e8e17f7c20b54da74c05b3a044f46d4b3bddf':
  emulator: Build emulator platform images as ARMv7-A

13 years agoam 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
David 'Digit' Turner [Mon, 20 Jun 2011 15:47:29 +0000 (08:47 -0700)]
am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"

* commit '04b963a1c037a7e9e8b5fb46603e009965293d9d':
  emulator: Build emulator platform images as ARMv7-A

13 years agoMerge "emulator: Build emulator platform images as ARMv7-A"
David 'Digit' Turner [Mon, 20 Jun 2011 13:56:36 +0000 (06:56 -0700)]
Merge "emulator: Build emulator platform images as ARMv7-A"

13 years agoIRJ81
The Android Automerger [Mon, 20 Jun 2011 13:44:53 +0000 (06:44 -0700)]
IRJ81

Change-Id: Ib71ea48c12bbfdb2755006cc906ee2e0440b2792

13 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 20 Jun 2011 13:44:44 +0000 (06:44 -0700)]
merge in ics-release history after reset to master

13 years agoIRJ78B
The Android Automerger [Sat, 18 Jun 2011 01:36:35 +0000 (18:36 -0700)]
IRJ78B

Change-Id: If4bf5d3470b2d324a71c310c429213501d70e7c3

13 years agoFix tab.
Ying Wang [Sat, 18 Jun 2011 00:44:08 +0000 (17:44 -0700)]
Fix tab.

The tab broke unbundled targets.

Change-Id: Ia97d4bdd69f7bb48eb3c51a01f0ab7085b5949a0

13 years agoExpand the full languages list to include the new locales.
Eric Fischer [Fri, 17 Jun 2011 23:48:37 +0000 (16:48 -0700)]
Expand the full languages list to include the new locales.

Change-Id: I20ee5547109d6fd70a00d5661f7242f37e17bde5

13 years agoMerge "fix broken build rules for host VM."
Ryo Fujii [Sat, 18 Jun 2011 00:25:04 +0000 (17:25 -0700)]
Merge "fix broken build rules for host VM."

13 years agoUniq the system properties.
Ying Wang [Sat, 18 Jun 2011 00:05:35 +0000 (17:05 -0700)]
Uniq the system properties.

If multiple items with the same key appear in a config variable,
only the first item is taken.

Change-Id: Icf57befafb36ec35dd4d48c8c3ec595f353f68e7

13 years agoAdd layoutlib-tests to sdk build.
Brett Chabot [Fri, 17 Jun 2011 23:57:04 +0000 (16:57 -0700)]
Add layoutlib-tests to sdk build.

Change-Id: I9087da4484b23f8eb0602210006038a395047a79

13 years agoIRJ78
The Android Automerger [Fri, 17 Jun 2011 21:27:59 +0000 (14:27 -0700)]
IRJ78

Change-Id: I66df4b8aa35797c4a15fec0bb2307f28844cc6b7

13 years agoam cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 21:22:44 +0000 (14:22 -0700)]
am cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"

* commit 'cc7dccc815cfd6c29e934f038cd0a0b9d8f51a6a':
  Tweak prelink map even more

13 years agocreated speex resampler library
Eric Laurent [Fri, 17 Jun 2011 03:53:25 +0000 (20:53 -0700)]
created speex resampler library

Change-Id: I4424cb40416d94ccf4637fbbb53f02d595c31e3d

13 years agoam 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 21:12:30 +0000 (14:12 -0700)]
am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"

* commit '91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
  Tweak prelink map even more

13 years agoam 1894085d: Merge "Tweak prelink map even more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 21:08:22 +0000 (14:08 -0700)]
am 1894085d: Merge "Tweak prelink map even more"

* commit '1894085d6e765878a928d901d1c91b16f9616d96':
  Tweak prelink map even more

13 years agoMerge "Tweak prelink map even more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 20:50:05 +0000 (13:50 -0700)]
Merge "Tweak prelink map even more"

13 years agoTweak prelink map even more
Jean-Baptiste Queru [Fri, 17 Jun 2011 20:20:32 +0000 (13:20 -0700)]
Tweak prelink map even more

Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0

13 years agoam ea54b50e: am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build...
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:46:31 +0000 (12:46 -0700)]
am ea54b50e: am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."

* commit 'ea54b50e560d911f3b7efd2638cf1f56afdd834d':
  Relax the constraint of 64bit build environment.

13 years agoam af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:46:29 +0000 (12:46 -0700)]
am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit 'af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef':
  Tweak prelink map

13 years agoam f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:23:21 +0000 (12:23 -0700)]
am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."

* commit 'f3659c8b0a1cf60d5bcd28d8a1c0e39716f4060f':
  Relax the constraint of 64bit build environment.

13 years agoam c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:21:37 +0000 (12:21 -0700)]
am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit 'c5e5d9897f6fc18123a8f5d15a90152019979a22':
  Tweak prelink map

13 years agoam 36c1f10d: Merge "Relax the constraint of 64bit build environment."
Jean-Baptiste Queru [Fri, 17 Jun 2011 19:02:44 +0000 (12:02 -0700)]
am 36c1f10d: Merge "Relax the constraint of 64bit build environment."

* commit '36c1f10dee646935d73106a01b1d50628b9a2dcb':
  Relax the constraint of 64bit build environment.

13 years agoam 9d7590b9: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:59:32 +0000 (11:59 -0700)]
am 9d7590b9: Merge "Tweak prelink map"

* commit '9d7590b93ff549cf8a4b432932fa68799166ed79':
  Tweak prelink map

13 years agofix broken build rules for host VM.
Ryo Fujii [Thu, 16 Jun 2011 23:58:11 +0000 (16:58 -0700)]
fix broken build rules for host VM.

13 years agoMerge "Relax the constraint of 64bit build environment."
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:19:14 +0000 (11:19 -0700)]
Merge "Relax the constraint of 64bit build environment."

13 years agoRelax the constraint of 64bit build environment.
Ying Wang [Tue, 24 May 2011 22:46:15 +0000 (15:46 -0700)]
Relax the constraint of 64bit build environment.

Change-Id: Id349f424b122816f42c99769b629a9447986cf20

13 years agoMerge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:36 +0000 (11:15 -0700)]
Merge "Tweak prelink map"

13 years agoTweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 18:15:00 +0000 (11:15 -0700)]
Tweak prelink map

Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2

13 years agoIRJ77D
The Android Automerger [Fri, 17 Jun 2011 15:52:42 +0000 (08:52 -0700)]
IRJ77D

Change-Id: I36403d6221a844c575cb5e74b70e45f05501d307

13 years agoam ff67ed65: am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink...
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:33:23 +0000 (08:33 -0700)]
am ff67ed65: am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit 'ff67ed65b8d22c54b1907f2df9a690d580a9ef7b':
  Tweak prelink map, more

13 years agoam 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:24:53 +0000 (08:24 -0700)]
am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit '5e2e09c569092dcc19f9646060cc1c33266eb213':
  Tweak prelink map, more

13 years agoam ee803184: am f771489d: Merge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 15:04:31 +0000 (08:04 -0700)]
am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit 'ee8031843e4dc3e9ff60c1acdc516121145fece1':
  Tweak prelink map, more

13 years agoam f771489d: Merge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:57:22 +0000 (07:57 -0700)]
am f771489d: Merge "Tweak prelink map, more"

* commit 'f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
  Tweak prelink map, more

13 years agoMerge "Tweak prelink map, more"
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:43:02 +0000 (07:43 -0700)]
Merge "Tweak prelink map, more"

13 years agoTweak prelink map, more
Jean-Baptiste Queru [Fri, 17 Jun 2011 14:33:52 +0000 (07:33 -0700)]
Tweak prelink map, more

Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7

13 years agoIRJ77C
The Android Automerger [Fri, 17 Jun 2011 13:40:36 +0000 (06:40 -0700)]
IRJ77C

Change-Id: I2016d162a88f637d06f83411e915a987d9bc2e25

13 years agoam 3305a5af: am 84891367: am 9bd85361: am 15ced7e1: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:31:59 +0000 (20:31 -0700)]
am 3305a5af: am 84891367: am 9bd85361: am 15ced7e1: Merge prelink map tweaks

* commit '3305a5af5398c66a074d2e329ac093f288e692f5':
  Tweak prelink map

13 years agoam 84891367: am 9bd85361: am 15ced7e1: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:29:36 +0000 (20:29 -0700)]
am 84891367: am 9bd85361: am 15ced7e1: Merge prelink map tweaks

* commit '8489136766b282d95f6e447a5ff4d63fbdbe8409':
  Tweak prelink map

13 years agoam 9bd85361: am 15ced7e1: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:25:43 +0000 (20:25 -0700)]
am 9bd85361: am 15ced7e1: Merge prelink map tweaks

* commit '9bd853612a45753512b3dab27f247adb46e7a3c8':
  Tweak prelink map

13 years agoam 15ced7e1: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:22:36 +0000 (20:22 -0700)]
am 15ced7e1: Merge prelink map tweaks

* commit '15ced7e137017befbae5bdde3b7ff60a27d897d4':
  Tweak prelink map

13 years agoMerge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 03:17:28 +0000 (20:17 -0700)]
Merge prelink map tweaks

Change-Id: I86f101e250e53beb197f9ea46e7dfb7e44f20063

13 years agoTweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map

Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25

13 years agoam 27c9c6f6: am 9f2e07d2: am 69ae44e2: am fd64de9a: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 02:06:48 +0000 (19:06 -0700)]
am 27c9c6f6: am 9f2e07d2: am 69ae44e2: am fd64de9a: Merge prelink map tweaks

* commit '27c9c6f6fea63f7fbeceacae4c0576cc2b343bac':
  Tweak prelink map

13 years agoam 9f2e07d2: am 69ae44e2: am fd64de9a: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 02:03:52 +0000 (19:03 -0700)]
am 9f2e07d2: am 69ae44e2: am fd64de9a: Merge prelink map tweaks

* commit '9f2e07d2c2147572edb7170206ba7ece6d42fcb5':
  Tweak prelink map

13 years agoam 69ae44e2: am fd64de9a: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:58:18 +0000 (18:58 -0700)]
am 69ae44e2: am fd64de9a: Merge prelink map tweaks

* commit '69ae44e284b1735928b8db53bf2e0690768e2d1b':
  Tweak prelink map

13 years agoam fd64de9a: Merge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:52:34 +0000 (18:52 -0700)]
am fd64de9a: Merge prelink map tweaks

* commit 'fd64de9ae410b6bfe024971bd543d42286d2990f':
  Tweak prelink map

13 years agoMerge prelink map tweaks
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:37:07 +0000 (18:37 -0700)]
Merge prelink map tweaks

Change-Id: I11895037a7c5768f48f18b63274daaa4d25bc681

13 years agoTweak prelink map
Jean-Baptiste Queru [Fri, 17 Jun 2011 01:36:55 +0000 (18:36 -0700)]
Tweak prelink map

Change-Id: I2363478ee375a9fdd6c2cc0fa0021bb5bb588d25

13 years agoam 9a708f4e: am 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink...
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:55:42 +0000 (17:55 -0700)]
am 9a708f4e: am 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '9a708f4eeb586d0a0087c6ed08e3287dae304f43':
  Tweak prelink map

13 years agoam 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:50:29 +0000 (17:50 -0700)]
am 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '2ba042f9d86c7715cbca07e0fd417d8cf9496846':
  Tweak prelink map

13 years agoam 40dc95be: am 14273125: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:32:11 +0000 (17:32 -0700)]
am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '40dc95be7744871b5363ae2e21a14343cd666b0f':
  Tweak prelink map

13 years agoam 14273125: Merge "Tweak prelink map"
Jean-Baptiste Queru [Fri, 17 Jun 2011 00:09:14 +0000 (17:09 -0700)]
am 14273125: Merge "Tweak prelink map"

* commit '142731256afc708f4ec07247bffbe733dcaed0f4':
  Tweak prelink map

13 years agoMerge "Tweak prelink map"
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:31:58 +0000 (16:31 -0700)]
Merge "Tweak prelink map"

13 years agoTweak prelink map
Jean-Baptiste Queru [Thu, 16 Jun 2011 23:17:42 +0000 (16:17 -0700)]
Tweak prelink map

Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1

13 years agoIRJ77B
The Android Automerger [Thu, 16 Jun 2011 21:32:58 +0000 (14:32 -0700)]
IRJ77B

Change-Id: I9b0dd4a1c18adc4854922feed0eb6bd6ef5278db

13 years agoam 4c60b305: (-s ours) am 70a89584: Merge 742968bd
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:14:24 +0000 (14:14 -0700)]
am 4c60b305: (-s ours) am 70a89584: Merge 742968bd

* commit '4c60b30542a674d6375d2cccbe90161b34e62e5a':
  Adding a cleanspec to pick up version change. Do not merge.

13 years agoam 70a89584: Merge 742968bd
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:12:18 +0000 (14:12 -0700)]
am 70a89584: Merge 742968bd

* commit '70a895846d9a9fdddd9d224e32959a53f9d3c97e':
  Adding a cleanspec to pick up version change. Do not merge.

13 years agoMerge 742968bd
Jean-Baptiste Queru [Thu, 16 Jun 2011 21:06:55 +0000 (14:06 -0700)]
Merge 742968bd

Change-Id: I90a9f487a8b6d9bc96dedbe9f1e978e439be8cd3

13 years agoAdding a cleanspec to pick up version change. Do not merge.
Dan Morrill [Thu, 16 Jun 2011 20:43:50 +0000 (13:43 -0700)]
Adding a cleanspec to pick up version change. Do not merge.

Change-Id: I4853ae86488164400d7a0203614b9e87515f6e61

13 years agoam 44fc3c66: (-s ours) am cedbd2f5: (-s ours) am eb27aa01: Merge "add ANDROID_HOST_OU...
Ed Heyl [Thu, 16 Jun 2011 20:26:15 +0000 (13:26 -0700)]
am 44fc3c66: (-s ours) am cedbd2f5: (-s ours) am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

* commit '44fc3c665d5709dfd3a89208892edd2b94387e5c':
  add ANDROID_HOST_OUT to env (please do not merge)

13 years agoam 13c7c023: (-s ours) am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back...
Jean-Baptiste Queru [Thu, 16 Jun 2011 20:25:31 +0000 (13:25 -0700)]
am 13c7c023: (-s ours) am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '13c7c0234d4e484cc72138424a61d0f8e85eb712':
  Switch back to mksh as the default

13 years agoam cedbd2f5: (-s ours) am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do...
Ed Heyl [Thu, 16 Jun 2011 20:19:42 +0000 (13:19 -0700)]
am cedbd2f5: (-s ours) am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

* commit 'cedbd2f587f894647ab5bf3bdd200ee78c673881':
  add ANDROID_HOST_OUT to env (please do not merge)

13 years agoam eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
Ed Heyl [Thu, 16 Jun 2011 20:17:08 +0000 (13:17 -0700)]
am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

* commit 'eb27aa01c87ed774cf5d71ce1c92d87575a08ad7':
  add ANDROID_HOST_OUT to env (please do not merge)

13 years agoam eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"
Jean-Baptiste Queru [Thu, 16 Jun 2011 20:09:12 +0000 (13:09 -0700)]
am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit 'eb9fc27dbe062248167981d2a4f1aa9e058a2313':
  Switch back to mksh as the default

13 years agoMerge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
Ed Heyl [Thu, 16 Jun 2011 20:08:09 +0000 (13:08 -0700)]
Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

13 years agoam 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"
Jean-Baptiste Queru [Thu, 16 Jun 2011 19:57:33 +0000 (12:57 -0700)]
am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '4c90a648cd0e1310d4b934c54905af3cf40b2770':
  Switch back to mksh as the default

13 years agoam ee69da5b: am 5aa44e2d: Merge bb41d06d
Jean-Baptiste Queru [Thu, 16 Jun 2011 19:43:14 +0000 (12:43 -0700)]
am ee69da5b: am 5aa44e2d: Merge bb41d06d

* commit 'ee69da5b4eda70146a245330b637f0bec4818660':
  Update version to 2.3.5.

13 years agoam 14bf45f3: Merge "Switch back to mksh as the default"
Jean-Baptiste Queru [Thu, 16 Jun 2011 18:39:18 +0000 (11:39 -0700)]
am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '14bf45f31d99cdaa5cc0c46efa3f2c2724704173':
  Switch back to mksh as the default

13 years agoMerge "Switch back to mksh as the default"
Jean-Baptiste Queru [Thu, 16 Jun 2011 17:53:27 +0000 (10:53 -0700)]
Merge "Switch back to mksh as the default"

13 years agoReconcile with honeycomb-mr2-release honeycomb-LTE-release
The Android Open Source Project [Thu, 16 Jun 2011 17:32:45 +0000 (10:32 -0700)]
Reconcile with honeycomb-mr2-release honeycomb-LTE-release

Change-Id: I38cd7acff7e6fd4789335170ec8bd91fe4853f4d

13 years agoSwitch back to mksh as the default
Jean-Baptiste Queru [Thu, 16 Jun 2011 16:25:58 +0000 (09:25 -0700)]
Switch back to mksh as the default

Change-Id: I4f39e8d8cc22520cd36f83f8675a716cc1ade1d9

13 years agoHLJ77
The Android Automerger [Thu, 16 Jun 2011 15:57:43 +0000 (08:57 -0700)]
HLJ77

Change-Id: I8d769731e3533e0a7be54333ec28f028baf232c4

13 years agomerge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 16 Jun 2011 15:57:05 +0000 (08:57 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE

13 years agoIRJ77
The Android Automerger [Thu, 16 Jun 2011 15:46:13 +0000 (08:46 -0700)]
IRJ77

Change-Id: I810f15c8ee53a1270807cf3ebd4d9777ea8d4c6c

13 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 16 Jun 2011 15:46:06 +0000 (08:46 -0700)]
merge in ics-release history after reset to master

13 years agoam 5aa44e2d: Merge bb41d06d
Jean-Baptiste Queru [Thu, 16 Jun 2011 14:46:17 +0000 (07:46 -0700)]
am 5aa44e2d: Merge bb41d06d

* commit '5aa44e2d7a15a743113aab386e465492d101e2bd':
  Update version to 2.3.5.

13 years agoMerge bb41d06d
Jean-Baptiste Queru [Thu, 16 Jun 2011 14:19:44 +0000 (07:19 -0700)]
Merge bb41d06d

Change-Id: Ieeeec2e835e3e7eb223a5f62927111db24295ccf

13 years agoHTJ76B
The Android Automerger [Thu, 16 Jun 2011 06:02:51 +0000 (23:02 -0700)]
HTJ76B

Change-Id: Ib7926f3add431484d3071e9539c95f4c8e015d19

13 years agomerge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 16 Jun 2011 06:02:45 +0000 (23:02 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2

13 years agoemulator: Build emulator platform images as ARMv7-A
David 'Digit' Turner [Wed, 15 Jun 2011 13:33:24 +0000 (15:33 +0200)]
emulator: Build emulator platform images as ARMv7-A

Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.

Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.

IMPORTANT: You need to have the following emulator patch in your tree
           in order to start these platform builds easily:

           https://review.source.android.com//#change,23798

Otherwise, the alternative is to do these things:

   1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
      an ARMv5TE one. This is normally done with "-qemu cortex-a8"

   2/ Using an ARMv7-A capable kernel image, which is available and
      usable with -kernel prebuilt/android-arm/kernel-qemu-armv7

Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).

So in reality, only 2/ is required.

Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed