Raphael Moll
8b40cbfe29
am de50d0ab: am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
...
* commit 'de50d0ab2008cbf836dc4fcbe9131a2071265946':
Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-23 08:16:38 -07:00
The Android Open Source Project
f4dce10fe5
Reconcile with gingerbread-release
...
Change-Id: I52a808eebd1d2ca2711fe13f92ffc71c5ff7ab0a
2011-06-23 07:27:04 -07:00
Ying Wang
98dfc99c46
Merge "Use the host STL for host native test."
2011-06-22 16:37:12 -07:00
Ying Wang
9de99fe2d2
Use the host STL for host native test.
...
Bug: 4584343
Change-Id: I420b7d955142d57993295cec12e54c94d5a75b88
2011-06-22 16:01:48 -07:00
Raphael Moll
de50d0ab20
am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
...
* commit 'd66054056311a369a090cd1aae2557454fdc7ecc':
Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-22 10:44:52 -07:00
Raphael Moll
d660540563
am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
...
* commit '7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b':
Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-22 10:40:01 -07:00
Raphael Moll
7f5a314ab6
am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
...
* commit '169c19ccb566d72a8ea142afb2550f9c54c5fea9':
Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-22 10:35:20 -07:00
Raphael Moll
169c19ccb5
Merge "Envsetup: Cygwin doesn't have 'ps -o command'."
2011-06-22 10:17:02 -07:00
Brett Chabot
5ee8418985
Revert mistakenly committed debug statement.
...
Change-Id: Iee6369002ba984821c889c7c0a92db061dc21355
2011-06-21 22:25:01 -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
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
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
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
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
Jean-Baptiste Queru
82b96df215
Tweak prelink map
...
Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2
2011-06-17 11:15:00 -07:00
Jean-Baptiste Queru
856c9df4fa
am ff67ed65: am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more"
...
* commit 'ff67ed65b8d22c54b1907f2df9a690d580a9ef7b':
Tweak prelink map, more
2011-06-17 08:33:23 -07:00
Jean-Baptiste Queru
ff67ed65b8
am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more"
...
* commit '5e2e09c569092dcc19f9646060cc1c33266eb213':
Tweak prelink map, more
2011-06-17 08:24:53 -07:00
Jean-Baptiste Queru
5e2e09c569
am ee803184: am f771489d: Merge "Tweak prelink map, more"
...
* commit 'ee8031843e4dc3e9ff60c1acdc516121145fece1':
Tweak prelink map, more
2011-06-17 08:04:31 -07:00
Jean-Baptiste Queru
ee8031843e
am f771489d: Merge "Tweak prelink map, more"
...
* commit 'f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
Tweak prelink map, more
2011-06-17 07:57:22 -07:00
Jean-Baptiste Queru
f771489d95
Merge "Tweak prelink map, more"
2011-06-17 07:43:02 -07:00
Jean-Baptiste Queru
398aaee7d7
Tweak prelink map, more
...
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
2011-06-17 07:33:52 -07:00