Elliott Hughes
91cb2cb341
Merge "toolbox: indicate why swap{on|off} failed"
2014-11-18 17:57:59 +00:00
Yabin Cui
6a56ad28c3
Merge "kill HAVE_TERMIO_H"
2014-11-18 02:22:38 +00:00
Yabin Cui
d325e866c4
kill HAVE_TERMIO_H
...
Bug: 18398307
Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
2014-11-17 18:19:11 -08:00
Elliott Hughes
ac252357bb
Merge "Remove atomic-inline.h."
2014-11-17 23:08:42 +00:00
Elliott Hughes
c3914d2be2
Remove atomic-inline.h.
...
Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
2014-11-17 14:38:56 -08:00
Elliott Hughes
3ef0460e86
Merge "Remove the error-prone TARGET_CPU_SMP from system/core."
2014-11-17 19:29:04 +00:00
Elliott Hughes
e9ca709a73
Remove the error-prone TARGET_CPU_SMP from system/core.
...
This means that code that uses libcutils no longer has to ensure that
it's set ANDROID_SMP in the calling code's Android.mk for this to
function correctly.
Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
2014-11-17 11:16:59 -08:00
Marco Nelissen
e11d81b37c
Merge "Update calls to IInterface::asBinder()"
2014-11-17 18:14:37 +00:00
Marco Nelissen
99f00d5ff3
Update calls to IInterface::asBinder()
...
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
2014-11-17 10:06:42 -08:00
Dan Albert
e90159b070
Merge "Move debuggerd to libc++."
2014-11-16 01:08:43 +00:00
Dan Albert
917d6f4c73
Merge "Move libutils to libc++."
2014-11-16 01:08:25 +00:00
Dan Albert
80b88cb5d2
Move debuggerd to libc++.
...
Bug: 15193147
Change-Id: I935a08e98077b688d1735fb5b84a615cb7df8810
2014-11-15 16:35:30 -08:00
Dan Albert
890442a02d
Move libutils to libc++.
...
Bug: 15193147
Change-Id: I85aff3bcabb5ee3c8be9918b7bef0fd1bbfa98e3
2014-11-15 16:32:26 -08:00
Dan Albert
133b7d4a84
Merge "Don't manually link libgtest_main in libion tests."
2014-11-14 21:38:17 +00:00
Dan Albert
29a34a5e7c
Merge "Disable the static libcutils tests."
2014-11-14 21:38:07 +00:00
Christopher Ferris
a46bf7eb68
Merge "Convert futex to cond wait."
2014-11-14 19:25:17 +00:00
Dan Albert
abe8d148b9
Don't manually link libgtest_main in libion tests.
...
This is actually probably broken right now, since these tests are
getting both the libc++ flavor and stlport flavor of libgtest_main.
Bug: 15193147
Change-Id: Ic2f8dda98240c12591803f3c3522505314a05609
2014-11-14 11:00:46 -08:00
Dan Albert
bb28776db0
Disable the static libcutils tests.
...
The static libcutils tests cannot be built when using libc++ because
there are multiple symbol definition errors between libc++ and libgcc.
Bug: 18389856
Change-Id: I6f41c561f97b3a37477f844e9abf6551524a0fa3
2014-11-14 10:56:34 -08:00
Christopher Ferris
3cdbfdce6a
Convert futex to cond wait.
...
Switch to the better supported pthread_cond to handle the Wait/Wake
functions.
Also, increase the number of simultaneous threads in the thread tests.
Bug: 18381207
(cherry picked from commit db44538387 )
Change-Id: Id326a7a7b92cb61573def3f761597c40f3ef2f4b
2014-11-14 10:46:39 -08:00
Andreas Gampe
6ef68b55b7
Merge "System/core: Use memmove"
2014-11-14 00:28:03 +00:00
Hans Boehm
64d7117efc
Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""
2014-11-14 00:17:19 +00:00
Hans Boehm
c56648948c
Second attempt to "Rewrite atomic.h to use stdatomic.h."
...
This should not be committed until win_sdk and aarch64 builds are
fixed in the presence of this CL.
This reverts commit 2789faabfa .
We additionally remove uniprocessor support from the earlier CL,
thus avoiding a potential compiler code reordering issue.
Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
2014-11-13 15:59:10 -08:00
Andreas Gampe
dd060f01f6
System/core: Use memmove
...
Should use memmove when you expect overlap.
Change-Id: I268a173db40a4be54232958e37aa8a03c2a885ee
2014-11-13 15:50:17 -08:00
Chih-Hung Hsieh
165238d8de
Merge "Fix a trivial typo."
2014-11-13 23:40:17 +00:00
Chih-Hung Hsieh
2c776811a4
Fix a trivial typo.
...
Clang compiler gave a correct warning on this mismatch of
names in #ifndef and #define.
Change-Id: I360f0c40ee98162093dde8f9815a02a54e5b2cb7
2014-11-13 15:33:38 -08:00
Yabin Cui
c9582d0239
Merge "kill HAVE_FORKEXEC"
2014-11-13 23:22:14 +00:00
Dan Albert
a3f16f22dc
Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace."
2014-11-13 23:00:08 +00:00
Dan Albert
5570c9b174
Add LOCAL_MULTILIB := both to Darwin libbacktrace.
...
This was previously set for libbacktrace_libc++, but apparently never
was for libbacktrace.
Change-Id: I85dc44b356710c6367f5cea3bc0a4d6c817ca202
2014-11-13 14:55:06 -08:00
Elliott Hughes
a78e1a7418
Merge "Sdcard: Initialize the padding output value"
2014-11-13 20:21:05 +00:00
Yabin Cui
8f7fc8dfed
Merge "kill HAVE_LOCALTIME_R"
2014-11-13 19:08:51 +00:00
JP Abgrall
b0a10b53ee
Merge "Fix segfault in get_character_device_symlinks()"
2014-11-13 18:24:07 +00:00
Tomasz Kondel
fca58f4b18
Fix segfault in get_character_device_symlinks()
...
A segmentation fault will occur when strchr function returns NULL.
Change-Id: I76076acfff16056179bf24dff5df9f81d9a45125
2014-11-13 18:23:34 +00:00
JP Abgrall
c325535d3d
Merge "Close fd on error path in do_mount()"
2014-11-13 18:21:25 +00:00
Tomasz Kondel
bfdcc40bff
Close fd on error path in do_mount()
...
This fix closes a file descriptor before returning
error from do_mount()
Change-Id: Ib370229f16bf9ac385162d6b163cc5b079a1e73e
2014-11-13 18:20:55 +00:00
Yabin Cui
8a98535bcb
kill HAVE_LOCALTIME_R
...
Bug: 18361583
Change-Id: Icdc745a5204bba26c6438d16ed38ec791e136163
2014-11-13 10:11:23 -08:00
Daisuke Okitsu
19ec8860c1
Sdcard: Initialize the padding output value
...
Add initialization of the output value in handle_write.
This value is referred to in FUSE so initialization is
necessary.
See also handle_open and handle_opendir.
Change-Id: I6507f113da9f6823fbfa459624d6594fc20afa51
2014-11-13 10:51:07 +01:00
Yabin Cui
e77b6a0862
kill HAVE_FORKEXEC
...
Bug: 18317407
Change-Id: I4eecb3c9d745e3dabfc46fa595aac7f94f6d93e3
2014-11-12 17:06:27 -08:00
Dan Albert
ca1797ae00
Merge "Remove the stlport linked libbacktrace."
2014-11-12 22:12:34 +00:00
Dan Albert
06279285ae
Merge "Revert "Move some tests to libc++.""
2014-11-12 05:43:55 +00:00
Dan Albert
1d3b492bde
Revert "Move some tests to libc++."
...
The build system is still linking both libgcc and libcompiler-rt,
which is causing duplicate symbol errors on some architectures. This
requires a fix in the build system, so reverting for now.
This reverts commit e3cccbfd47 .
2014-11-11 21:42:27 -08:00
Dan Albert
5c7e2e6030
Merge "Move liblog tests and benchmarks to libc++."
2014-11-12 03:44:42 +00:00
Dan Albert
f2dedb7a5f
Move liblog tests and benchmarks to libc++.
...
Bug: 15193147
Change-Id: Ib063eb9490e40f9d10c0b0f29b7808c729e4fff9
2014-11-12 03:44:16 +00:00
Dan Albert
7d196df6f9
Merge "Move some tests to libc++."
2014-11-12 01:53:28 +00:00
Dan Albert
e3cccbfd47
Move some tests to libc++.
...
Bug: 15193147
Change-Id: I93244e4a5d0c751056910ec8005a92401d305716
2014-11-11 23:59:02 +00:00
Dan Albert
0d7164d4dd
Remove the stlport linked libbacktrace.
...
Rename the libc++ linked libbacktrace to the normal name.
Bug: 15193147
Change-Id: I75caf1ee527e3703825e0db757497fb8fa3dd122
2014-11-11 15:57:38 -08:00
Daniel Rosenberg
4b862563be
Merge "property_service: Added vendor build properties to load_all_props"
2014-11-11 20:39:58 +00:00
Daniel Rosenberg
b95122205d
property_service: Added vendor build properties to load_all_props
...
Change-Id: I267bd848e1f6e2978024c07e603b25f1f41f5fbf
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-11-11 12:17:00 -08:00
Yabin Cui
2c0839e9db
Merge "kill HAVE_POSIX_FILEMAP"
2014-11-11 19:24:20 +00:00
Yabin Cui
266092c52d
kill HAVE_POSIX_FILEMAP
...
Bug: 18315579
Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
2014-11-11 10:31:30 -08:00
Elliott Hughes
b0d3027169
Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."
2014-11-10 23:51:15 +00:00