Mark Salyzyn
36ccca155c
Merge "toolbox: turn on -Werror"
2014-05-21 15:40:14 +00:00
Elliott Hughes
4a343436e0
Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."
2014-05-20 19:18:11 +00:00
Elliott Hughes
0bff5bd952
Fix win32 undefined reference to `_socket_network_client_timeout'.
...
Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
2014-05-20 12:13:29 -07:00
Ben Cheng
3816305b58
Merge "Address additional warnings found by GCC 4.9."
2014-05-20 17:53:18 +00:00
Ben Cheng
43232920f3
Address additional warnings found by GCC 4.9.
...
Change-Id: I8aae6c3e1ccc2294f4db455e1b4f3b4c34a00aaf
2014-05-20 10:51:02 -07:00
Elliott Hughes
51e27f955b
Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
2014-05-20 15:52:59 +00:00
Elliott Hughes
b911cf0af4
Fix win32 implicit declaration of function socket_network_client_timeout.
...
Change-Id: Ic6070855a21920384c555c9c82b9a2e4a776cbae
2014-05-20 08:51:15 -07:00
Elliott Hughes
9e0a62487b
Merge "Fix Windows socket_network_client.c build failures."
2014-05-19 23:48:10 +00:00
Elliott Hughes
36739556db
Fix Windows socket_network_client.c build failures.
...
Change-Id: Ie67a2305ade02e078bf0edf54104c295b091b1b7
2014-05-19 16:47:12 -07:00
Elliott Hughes
9cae50b38d
Merge "Bound the ADB connect time with a non-blocking connect"
2014-05-19 23:18:49 +00:00
Ken Lierman
aecc6a6657
Bound the ADB connect time with a non-blocking connect
...
After a disconnect, the initial blocking connect takes
a long time to return, while subsequent calls return
quicks. Switch to a non-blocking connect to make the
re-connect time more consistent and faster overall.
Change-Id: I21d02b22a8eb9a457c2f1fa95eb17894d5612ccd
Signed-off-by: Ken Lierman <ken.lierman@windriver.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
2014-05-19 16:16:42 -07:00
Dan Albert
201bf6769f
Merge "Really fixes the ub branches"
2014-05-19 22:34:06 +00:00
Dan Albert
ad51136267
Really fixes the ub branches
...
Change-Id: I1d78f4e6c1d8086c2895f6739c3202e9ef74fee2
2014-05-19 14:49:13 -07:00
Dan Albert
e1efe23ff7
Merge "Fix unbundled branches"
2014-05-19 19:21:37 +00:00
Dan Albert
a8b8460220
Fix unbundled branches
...
Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
2014-05-19 11:40:27 -07:00
Dan Albert
f03bd9537b
Merge "Adds libc++ versions of libbacktrace"
2014-05-19 18:19:08 +00:00
Dan Albert
40a46dde9c
Adds libc++ versions of libbacktrace
...
Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
2014-05-19 10:23:16 -07:00
Elliott Hughes
0296be9d98
Merge "Teach debuggerd the name of SIGTRAP."
2014-05-17 06:23:15 +00:00
Elliott Hughes
a323b504a7
Teach debuggerd the name of SIGTRAP.
...
Also add SIGTRAP to the list of signals we don't want to double fault on.
Bug: 15024256
Change-Id: I23ab80800563c007fcd3e42527329fedf762f0c8
2014-05-16 21:12:17 -07:00
Elliott Hughes
541859dbf7
Merge "Remove the broken LED flashing code from debuggerd."
2014-05-17 04:02:40 +00:00
Elliott Hughes
27ab751c7b
Remove the broken LED flashing code from debuggerd.
...
Change-Id: I4d0cbe14daa90ac5f91ce4597584448ee3c65dda
2014-05-16 20:54:36 -07:00
Elliott Hughes
9cb0b5719c
Merge "Output correct gdbserver instructions from debuggerd."
2014-05-17 03:34:38 +00:00
Elliott Hughes
d9bf2b2137
Output correct gdbserver instructions from debuggerd.
...
Bug: 15021938
Change-Id: I2df433d939f5f83ed2a2a30af357b83e4d8e5331
2014-05-16 19:51:41 -07:00
Ying Wang
770cd7c7e7
Merge "Fix host 64-bit build."
2014-05-17 01:31:29 +00:00
Elliott Hughes
c4afc19236
Merge "Add SIGTRAP support to crasher and debuggerd."
2014-05-17 00:39:22 +00:00
Elliott Hughes
7e35ae8fc8
Add SIGTRAP support to crasher and debuggerd.
...
Bug: 15024256
Change-Id: I3f34993fcfd9799306852b0a2195db468370be6e
2014-05-16 17:27:59 -07:00
Colin Cross
2d03a498f9
Merge "correct the setenv option judging condition"
2014-05-16 20:47:15 +00:00
Gavin.Chang
c3a4676c7f
correct the setenv option judging condition
...
Change-Id: I10ed6275374f572da639f26611f607bf7607905c
2014-05-16 20:46:58 +00:00
Mark Salyzyn
bc741ac212
Merge "logd: logcat: debuggerd: auditd logs to events"
2014-05-16 20:34:18 +00:00
Ying Wang
cf86e2f85d
Fix host 64-bit build.
...
Bug: 13751317
Change-Id: Ib42d24408d053bacc24142ed18fc5f3181d2345b
2014-05-16 09:36:17 -07:00
Mark Salyzyn
8b2d46a5fc
Merge "init: logd: Allow Developer settings to adjust logd size"
2014-05-16 00:27:08 +00:00
Greg Hackmann
b4ad6911a4
Merge "libadf: silence false positive warning"
2014-05-15 22:45:10 +00:00
Mark Salyzyn
989980c55d
logd: logcat: debuggerd: auditd logs to events
...
- auditd switch to recording logs to events log id
- logcat add events as one of the default logs
- debuggerd collect events log as well.
ToDo: debuggerd & bugreport collect intermixed logs.
BUG: 14626551
Change-Id: I958f0e729b7596748be57488a38824db5645be7b
2014-05-15 08:50:50 -07:00
Narayan Kamath
75a8eeb1ec
Merge "Change app_process reference to app_process32."
2014-05-15 09:36:33 +00:00
Narayan Kamath
5f6beb12c1
Merge ""stop" / "start must apply to the secondary zygote as well."
2014-05-15 09:15:52 +00:00
Kenny Root
d20ba7fca2
Merge "ps: add flag to show ABI"
2014-05-15 00:03:41 +00:00
Elliott Hughes
ed02fbf05c
Merge "Clean up some unnecessary system_properties cruft."
2014-05-14 23:59:27 +00:00
Elliott Hughes
f94853f294
Clean up some unnecessary system_properties cruft.
...
Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
2014-05-14 16:51:09 -07:00
Kenny Root
8f197e6579
ps: add flag to show ABI
...
Allow us to easily identify the 32/64 bitness of the process. Yes, I
know this is not technically an ABI, but it seemed close enough!
Change-Id: Ia03a17fd74d61e7619911cb26b3dd7d82b62930c
2014-05-14 16:11:37 -07:00
Sreeram Ramachandran
f03397fad4
Merge changes If5359c26,I5d09be41
...
* changes:
Use a function instead of a macro.
Mark sockets on accept().
2014-05-14 19:41:45 +00:00
Sreeram Ramachandran
7516148597
Merge "Introduce netd_client, a dynamic library that talks to netd."
2014-05-14 19:41:39 +00:00
Sreeram Ramachandran
09eaad793a
Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
2014-05-14 19:41:33 +00:00
Mark Salyzyn
aa907768af
toolbox: turn on -Werror
...
- Deal with some signedness issues
- Deal with some size issues
- Deal with NULL pointer issues
- Deal with some -Wunused issues
Change-Id: I1479dd90d690084491bae3475f2c547833519a57
2014-05-14 12:41:24 -07:00
Sreeram Ramachandran
6af621f792
Use a function instead of a macro.
...
(cherry picked from commit f3e4a8bb245afe874561eb7275f49dae0e7e55dd)
Change-Id: If5359c26a1474de0c278193fd2f09168f3184dee
2014-05-14 11:15:20 -07:00
Sreeram Ramachandran
b87b17a895
Mark sockets on accept().
...
(cherry picked from commit 1321cfecc6fb0e075796a34ed3c6a30d7ff3bea3)
Change-Id: I5d09be413cf720fbed905f96313b007997ada76c
2014-05-14 11:14:41 -07:00
Sreeram Ramachandran
154ebe80a0
Introduce netd_client, a dynamic library that talks to netd.
...
This library is dynamically loaded and used by bionic, to replace selected
standard socket syscalls with versions that talk to netd.
Implement connect() by requesting that the socket be marked with the netId of
the default network and then calling through to the actual syscall.
There are two escape hatches:
+ If the fwmark server is unavailable, it isn't an error; we proceed with the
syscall. This might help at boot time (when the server isn't ready yet) and if
we get rid of the fwmarkd socket entirely in future platform versions.
+ If the ANDROID_NO_USE_FWMARK_CLIENT environment variable is set, we don't
attempt to use the fwmark server (even if it's available). This allows apps to
sidestep unforseen issues in production at runtime.
(cherry picked from commit 0581cb455ef924f128a5c6d46bc70868b5099eec)
Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
2014-05-14 11:13:53 -07:00
Sreeram Ramachandran
e38d470714
Introduce fwmarkd: a service to set the fwmark of sockets.
...
(cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3)
Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
2014-05-14 11:12:42 -07:00
Mark Salyzyn
3fe8afa404
Merge "fastboot: turn on -Werror"
2014-05-14 18:04:11 +00:00
Mark Salyzyn
506a536b1e
Merge "libzipfile: turn on -Werror"
2014-05-14 18:03:53 +00:00
Narayan Kamath
b4932d592f
Change app_process reference to app_process32.
...
Required due to change 5a7ee9ad63 which makes
app_process a symlink to the primary zygote.
Change-Id: I940f6302db97f74dd57112e310014e989dc586e5
2014-05-14 16:41:18 +01:00