Commit graph

5979 commits

Author SHA1 Message Date
Brett Chabot
5ee8418985 Revert mistakenly committed debug statement.
Change-Id: Iee6369002ba984821c889c7c0a92db061dc21355
2011-06-21 22:25:01 -07:00
The Android Automerger
582c473146 HTJ82B
Change-Id: Ice0a2f97d729260b3b85842ebcd1183ca12ed06e
2011-06-21 20:06:48 -07:00
The Android Automerger
09204d98a5 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-21 20:06:44 -07:00
The Android Automerger
7ec99b6d76 HMJ82
Change-Id: I54f6cb71926b9808fbad655e0ba79bf4c8225217
2011-06-21 19:17:48 -07:00
The Android Automerger
86e7072478 HTJ82
Change-Id: I91c10698321d2bada7e23c0dc28f99ce13d5cc02
2011-06-21 16:04:37 -07:00
The Android Automerger
c57459f4b5 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-21 16:04:33 -07:00
David 'Digit' Turner
1ccb41ee12 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
2011-06-21 15:27:10 -07:00
Jean-Baptiste Queru
32adb83e49 am 2feecf6f: am cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"
* commit '2feecf6f379438c2e8ebc4c270ad9e4d62f6c37c':
  Tweak prelink map even more
2011-06-21 15:24:48 -07:00
Jean-Baptiste Queru
86631961b5 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.
2011-06-21 13:45:43 -07:00
Jean-Baptiste Queru
56846412a8 am 4a9dd2dc: am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
* commit '4a9dd2dc4a22d900d7d5d9dc5f8f9f27c3f3b871':
  Tweak prelink map
2011-06-21 13:45:36 -07:00
Brett Chabot
13fe14afe5 Merge "Add layoutlib-tests to sdk build." 2011-06-21 11:27:24 -07:00
android-merger
4b814fe549 GRJ82
Change-Id: If9df26a746f9a2236e1234afd06dcbf0782f4dd0
2011-06-21 10:37:59 -07:00
The Android Automerger
a0ebe49468 HLJ82
Change-Id: If2aaf6546fe95d28d3bf6ca9639e4a78c4244b4a
2011-06-21 07:24:27 -07:00
The Android Automerger
2535f7e240 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-21 07:24:03 -07:00
Raphael Moll
c639c787a0 Lunch: don't use a toolchain that doesn't exist.
"lunch sdk-eng" on cygwin tries to use a gcc.exe from the
prebuild arm toolchain, but it doesn't exist. This prevents
from setting variables to point on a gcc toolchain if there
is none for the given arch.

Change-Id: I3b72220663687f9fdaacc050899aef00632f2c3c
2011-06-21 06:11:05 -07:00
The Android Automerger
f38f132c8a HLJ81B
Change-Id: I51213c13fc686b93c83369657dcd8b6f47523051
2011-06-20 18:39:43 -07:00
The Android Automerger
ec5181e91d merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-20 18:39:36 -07:00
Raphael Moll
70a86b0fb7 Envsetup: Cygwin doesn't have 'ps -o command'.
Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.

Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
2011-06-20 16:03:14 -07:00
Eric Fischer
cf2e7ce98e Merge "Expand the full languages list to include the new locales." 2011-06-20 12:02:46 -07:00
Ying Wang
c383f1b65d Merge "Uniq the system properties." 2011-06-20 11:05:27 -07:00
David 'Digit' Turner
1c5df4396b 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
2011-06-20 09:10:58 -07:00
David 'Digit' Turner
4f9479bfdb am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '683e8e17f7c20b54da74c05b3a044f46d4b3bddf':
  emulator: Build emulator platform images as ARMv7-A
2011-06-20 09:04:39 -07:00
David 'Digit' Turner
683e8e17f7 am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
* commit '04b963a1c037a7e9e8b5fb46603e009965293d9d':
  emulator: Build emulator platform images as ARMv7-A
2011-06-20 08:47:29 -07:00
The Android Automerger
26ce2d14b2 HLJ81
Change-Id: I01377b8542a25afb69d6162c9e6833355186b982
2011-06-20 07:18:57 -07:00
The Android Automerger
2fd3c5ded5 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-06-20 07:18:52 -07:00
David 'Digit' Turner
04b963a1c0 Merge "emulator: Build emulator platform images as ARMv7-A" 2011-06-20 06:56:36 -07:00
Ying Wang
cf5da40e52 Fix tab.
The tab broke unbundled targets.

Change-Id: Ia97d4bdd69f7bb48eb3c51a01f0ab7085b5949a0
2011-06-17 17:44:08 -07:00
Eric Fischer
a89d26ae40 Expand the full languages list to include the new locales.
Change-Id: I20ee5547109d6fd70a00d5661f7242f37e17bde5
2011-06-17 17:33:18 -07:00
Ryo Fujii
c0de1ea8df Merge "fix broken build rules for host VM." 2011-06-17 17:25:04 -07:00
Ying Wang
7e8d442ca4 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
2011-06-17 17:10:04 -07:00
Brett Chabot
a04dd5eef5 Add layoutlib-tests to sdk build.
Change-Id: I9087da4484b23f8eb0602210006038a395047a79
2011-06-17 16:57:04 -07:00
Jean-Baptiste Queru
2feecf6f37 am cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"
* commit 'cc7dccc815cfd6c29e934f038cd0a0b9d8f51a6a':
  Tweak prelink map even more
2011-06-17 14:22:44 -07:00
Eric Laurent
99acb9c261 created speex resampler library
Change-Id: I4424cb40416d94ccf4637fbbb53f02d595c31e3d
2011-06-17 14:21:17 -07:00
The Android Automerger
8f21b4939e HTJ78B
Change-Id: Id097e41f74e872e5f311a58f9bd1bf94fdad343c
2011-06-17 14:14:30 -07:00
Jean-Baptiste Queru
cc7dccc815 am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"
* commit '91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
  Tweak prelink map even more
2011-06-17 14:12:30 -07:00
Jean-Baptiste Queru
91ba5de815 am 1894085d: Merge "Tweak prelink map even more"
* commit '1894085d6e765878a928d901d1c91b16f9616d96':
  Tweak prelink map even more
2011-06-17 14:08:22 -07:00
Jean-Baptiste Queru
1894085d6e Merge "Tweak prelink map even more" 2011-06-17 13:50:05 -07:00
Jean-Baptiste Queru
7751f426fe Tweak prelink map even more
Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
2011-06-17 13:20:32 -07:00
Jean-Baptiste Queru
2a85de6d44 am ea54b50e: am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit 'ea54b50e560d911f3b7efd2638cf1f56afdd834d':
  Relax the constraint of 64bit build environment.
2011-06-17 12:46:31 -07:00
Jean-Baptiste Queru
4a9dd2dc4a am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
* commit 'af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef':
  Tweak prelink map
2011-06-17 12:46:29 -07:00
Jean-Baptiste Queru
ea54b50e56 am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit 'f3659c8b0a1cf60d5bcd28d8a1c0e39716f4060f':
  Relax the constraint of 64bit build environment.
2011-06-17 12:23:21 -07:00
Jean-Baptiste Queru
af1b618c0d am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
* commit 'c5e5d9897f6fc18123a8f5d15a90152019979a22':
  Tweak prelink map
2011-06-17 12:21:37 -07:00
Jean-Baptiste Queru
f3659c8b0a am 36c1f10d: Merge "Relax the constraint of 64bit build environment."
* commit '36c1f10dee646935d73106a01b1d50628b9a2dcb':
  Relax the constraint of 64bit build environment.
2011-06-17 12:02:44 -07:00
Jean-Baptiste Queru
c5e5d9897f am 9d7590b9: Merge "Tweak prelink map"
* commit '9d7590b93ff549cf8a4b432932fa68799166ed79':
  Tweak prelink map
2011-06-17 11:59:32 -07:00
Ryo Fujii
cbb3266b47 fix broken build rules for host VM. 2011-06-17 11:58:58 -07:00
The Android Automerger
40db7c9611 HTJ78
Change-Id: I15bdf78cb344897149d105e4453f9abba8af48f8
2011-06-17 11:51:44 -07:00
The Android Automerger
a701ed730f merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-06-17 11:51:23 -07:00
Jean-Baptiste Queru
36c1f10dee Merge "Relax the constraint of 64bit build environment." 2011-06-17 11:19:14 -07:00
Ying Wang
2914f7f3b3 Relax the constraint of 64bit build environment.
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
2011-06-17 11:18:10 -07:00
Jean-Baptiste Queru
9d7590b93f Merge "Tweak prelink map" 2011-06-17 11:15:37 -07:00