Mark Salyzyn
7d28098b9a
am 99337883
: Merge "sdcard: Turn on -Werror"
...
* commit '993378832e6f580b3b13b189f3656066492fe80a':
sdcard: Turn on -Werror
2014-05-22 19:11:20 +00:00
Mark Salyzyn
993378832e
Merge "sdcard: Turn on -Werror"
2014-05-22 19:05:25 +00:00
Mark Salyzyn
f1c66a852f
am 5e9c2b9f
: Merge "reboot: Turn on -Werror"
...
* commit '5e9c2b9faa6fbf6ce8dab3a7d5029f582066b487':
reboot: Turn on -Werror
2014-05-22 17:39:43 +00:00
Mark Salyzyn
5e9c2b9faa
Merge "reboot: Turn on -Werror"
2014-05-22 17:34:06 +00:00
Dan Albert
3ab1d61b75
am 3b5cd911
: Merge "Remove libstdc++ dependency from host libbacktrace"
...
* commit '3b5cd9117df7e7420055352b496383a477f008d3':
Remove libstdc++ dependency from host libbacktrace
2014-05-22 17:27:05 +00:00
Dan Albert
3b5cd9117d
Merge "Remove libstdc++ dependency from host libbacktrace"
2014-05-22 17:21:52 +00:00
Elliott Hughes
337f94f1eb
am e9a6d0a0
: Merge "Remove unnecessary #includes of <sys/atomics.h>."
...
* commit 'e9a6d0a09950b9d28f63c8bb3e05530cd23574c0':
Remove unnecessary #includes of <sys/atomics.h>.
2014-05-22 17:06:02 +00:00
Elliott Hughes
e9a6d0a099
Merge "Remove unnecessary #includes of <sys/atomics.h>."
2014-05-22 17:02:25 +00:00
Elliott Hughes
617681d355
Remove unnecessary #includes of <sys/atomics.h>.
...
Bug: 14903517
Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
2014-05-22 10:00:35 -07:00
Mark Salyzyn
8c6245e11d
am 80e16069
: Merge "libsync: Turn on -Werror"
...
* commit '80e160693c795aacfecd5ba34caa1485a6c717f4':
libsync: Turn on -Werror
2014-05-22 16:49:49 +00:00
Mark Salyzyn
80e160693c
Merge "libsync: Turn on -Werror"
2014-05-22 16:46:53 +00:00
Elliott Hughes
49ea55f599
am 48ac3d1b
: Merge "Judge mmap failed by MAP_FAILED instead of NULL"
...
* commit '48ac3d1b14f036a4994adba22707f7465ccfae2f':
Judge mmap failed by MAP_FAILED instead of NULL
2014-05-22 16:27:19 +00:00
Elliott Hughes
48ac3d1b14
Merge "Judge mmap failed by MAP_FAILED instead of NULL"
2014-05-22 16:23:20 +00:00
Calin Juravle
72f5117984
am cd3897d0
: Merge "Move libutils from fdprintf to POSIX dprintf."
...
* commit 'cd3897d0af0c7b5a3b4913a2b0cca715fdfb890c':
Move libutils from fdprintf to POSIX dprintf.
2014-05-22 13:40:35 +00:00
Calin Juravle
cd3897d0af
Merge "Move libutils from fdprintf to POSIX dprintf."
2014-05-22 13:37:13 +00:00
Elliott Hughes
dcc98da018
Move libutils from fdprintf to POSIX dprintf.
...
Bug: 11156955
Change-Id: I70a75c07744d9897d76b180e4940b8717297c53f
2014-05-22 01:23:29 -07:00
Hurri Lu
473a729937
Judge mmap failed by MAP_FAILED instead of NULL
...
Change-Id: I74422cfdba341fcd1a6235044700cf3986e853d0
Signed-off-by: Hurri Lu <jlu32@marvell.com>
2014-05-22 12:51:39 +08:00
Dan Albert
7f8ebb8178
am 30291f21
: Merge "Add missing headers"
...
* commit '30291f2119be5a8ce3491a715e07f28062532f4d':
Add missing headers
2014-05-22 03:27:42 +00:00
Dan Albert
30291f2119
Merge "Add missing headers"
2014-05-22 03:16:14 +00:00
Dan Albert
a3a8f6d2ab
Remove libstdc++ dependency from host libbacktrace
...
The libc++ version of libbacktrace on the host was still linking against
libstdc++, and this was causing problems in art.
Change-Id: I1d14fb9e18abd074affcf46c8044407041970669
2014-05-21 20:10:02 -07:00
Dan Albert
ac2fe7eb81
Add missing headers
...
These headers are needed for pid_t and free when using libc++ headers (POSIX
does not require that the symbols be exposed with the previous includes).
Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e
2014-05-21 20:08:35 -07:00
Elliott Hughes
4077acd2c4
am 21be143a
: Merge "Fix register dump and back trace after a crash."
...
* commit '21be143a0e4c1b24a6a5a3b5a681c570d63b2525':
Fix register dump and back trace after a crash.
2014-05-21 23:52:44 +00:00
Elliott Hughes
21be143a0e
Merge "Fix register dump and back trace after a crash."
2014-05-21 23:41:58 +00:00
Douglas Leung
6254f32f21
Fix register dump and back trace after a crash.
...
Change-Id: Ie5f6624b9dcf81d84769b9cdaf9d8a301c8826f7
Signed-off-by: Douglas Leung <douglas@mips.com>
2014-05-21 16:41:20 -07:00
Mark Salyzyn
9a12e952b3
am 5b7bb03e
: Merge "Revert "libnetutils: Turn on -Werror""
...
* commit '5b7bb03ee84185bd83a594569264cc3841b80749':
Revert "libnetutils: Turn on -Werror"
2014-05-21 22:46:12 +00:00
Mark Salyzyn
2c0a7f6fd9
am d3cd08f8
: Merge "libnetutils: Turn on -Werror"
...
* commit 'd3cd08f831be240342a2364160e5a537d3795f22':
libnetutils: Turn on -Werror
2014-05-21 22:46:12 +00:00
Mark Salyzyn
5b7bb03ee8
Merge "Revert "libnetutils: Turn on -Werror""
2014-05-21 22:17:14 +00:00
Mark Salyzyn
07dde4c314
Revert "libnetutils: Turn on -Werror"
...
This reverts commit 249c26de82
.
Change-Id: I2a56c574fa8d842d5f3c51fd57ecf078838fcfec
2014-05-21 22:14:38 +00:00
Mark Salyzyn
d3cd08f831
Merge "libnetutils: Turn on -Werror"
2014-05-21 21:55:29 +00:00
Mark Salyzyn
c817949822
am 2f62edf7
: Merge "libdiskconfig: Turn on -Werror"
...
* commit '2f62edf77d94caaca57ff5e36bd866e02f3c2fa0':
libdiskconfig: Turn on -Werror
2014-05-21 21:08:23 +00:00
Mark Salyzyn
2f62edf77d
Merge "libdiskconfig: Turn on -Werror"
2014-05-21 21:00:53 +00:00
Mark Salyzyn
676ffd54cb
sdcard: Turn on -Werror
...
Change-Id: I40fce5a69a898e79542aa7688d077ff7bc40ed4f
2014-05-21 12:58:38 -07:00
Mark Salyzyn
efdf49f276
reboot: Turn on -Werror
...
Change-Id: Ic3186e457b80ee6149ef89321b0d16422872aea7
2014-05-21 12:58:38 -07:00
Mark Salyzyn
af7749891a
libsync: Turn on -Werror
...
Change-Id: Ie34f935694034a069e844be64d6011eb9e3f9869
2014-05-21 12:58:38 -07:00
Mark Salyzyn
249c26de82
libnetutils: Turn on -Werror
...
Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2882
2014-05-21 12:58:37 -07:00
Mark Salyzyn
42c79fe18b
libdiskconfig: Turn on -Werror
...
Change-Id: Ic0f5871bd434fda78df79b1417f7bc610d99f73e
2014-05-21 12:58:37 -07:00
Colin Cross
28c305183a
am 1742b7d2
: Merge "Modify VID for Compal"
...
* commit '1742b7d218706c596e6b40c89a6660f30bdba022':
Modify VID for Compal
2014-05-21 19:28:43 +00:00
Colin Cross
1742b7d218
Merge "Modify VID for Compal"
2014-05-21 19:24:53 +00:00
Greg Hackmann
376aebdc9d
am 76d057b9
: Merge "toolbox: fix x86 build"
...
* commit '76d057b9708f92662a3002cffd55ecc05a860df4':
toolbox: fix x86 build
2014-05-21 18:13:18 +00:00
Greg Hackmann
76d057b970
Merge "toolbox: fix x86 build"
2014-05-21 18:10:31 +00:00
Greg Hackmann
2122aac5c9
toolbox: fix x86 build
...
Change-Id: Iadedae749b31adb1310fa50a68b2dc19097c3654
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 11:04:32 -07:00
Greg Hackmann
153c7aabdc
am 5eedd9d6
: Merge "toolbox: fix build"
...
* commit '5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3':
toolbox: fix build
2014-05-21 17:46:12 +00:00
Greg Hackmann
5eedd9d62f
Merge "toolbox: fix build"
2014-05-21 17:43:10 +00:00
Greg Hackmann
eeed45fa24
toolbox: fix build
...
Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-21 10:39:44 -07:00
Sreeram Ramachandran
f8733c63aa
am 08c08f72
: Merge "Move netd_client into netd."
...
* commit '08c08f72617b13696049bf295646d6a68f3f1a8c':
Move netd_client into netd.
2014-05-21 17:01:39 +00:00
Sreeram Ramachandran
08c08f7261
Merge "Move netd_client into netd."
2014-05-21 16:59:51 +00:00
Sreeram Ramachandran
91dc3369d3
Move netd_client into netd.
...
(cherry picked from commit f1b21c5c73
)
Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
2014-05-21 09:26:57 -07:00
Mark Salyzyn
e2fb764c3b
am 36ccca15
: Merge "toolbox: turn on -Werror"
...
* commit '36ccca155c03053397b953e4cc0ed8a8338d2450':
toolbox: turn on -Werror
2014-05-21 15:42:48 +00:00
Mark Salyzyn
36ccca155c
Merge "toolbox: turn on -Werror"
2014-05-21 15:40:14 +00:00
Elliott Hughes
6dfb039b0b
am 4a343436
: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
...
* commit '4a343436e01b07c21c043f8a903689f70000ca73':
Fix win32 undefined reference to `_socket_network_client_timeout'.
2014-05-20 19:21:36 +00:00