diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-10-20 18:03:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-20 18:03:57 +0000 |
| commit | 8a7297a09f3a0d98a4a058767f6a447ef0e9d77d (patch) | |
| tree | 04081c2735ce7f9f54f5c6d23a89abe9d04e3de7 /libsysutils | |
| parent | de3e60043ceb9c814bd7a3dabc5fd734a63835cf (diff) | |
| parent | 27d2d49f4872c26831d3e016765c62def3d2fb01 (diff) | |
| download | system_core-8a7297a09f3a0d98a4a058767f6a447ef0e9d77d.tar.gz system_core-8a7297a09f3a0d98a4a058767f6a447ef0e9d77d.tar.bz2 system_core-8a7297a09f3a0d98a4a058767f6a447ef0e9d77d.zip | |
Merge "system/core: preparation to pull back interfaces from android/log.h"
am: 27d2d49f48
Change-Id: I604bb1d4cf62636663fa92e3d14a55887dbcae23
Diffstat (limited to 'libsysutils')
| -rw-r--r-- | libsysutils/src/FrameworkCommand.cpp | 2 | ||||
| -rw-r--r-- | libsysutils/src/FrameworkListener.cpp | 3 | ||||
| -rw-r--r-- | libsysutils/src/NetlinkEvent.cpp | 2 | ||||
| -rw-r--r-- | libsysutils/src/NetlinkListener.cpp | 3 | ||||
| -rw-r--r-- | libsysutils/src/ServiceManager.cpp | 4 | ||||
| -rw-r--r-- | libsysutils/src/SocketClient.cpp | 3 | ||||
| -rw-r--r-- | libsysutils/src/SocketListener.cpp | 3 |
7 files changed, 13 insertions, 7 deletions
diff --git a/libsysutils/src/FrameworkCommand.cpp b/libsysutils/src/FrameworkCommand.cpp index dccacda4e..a6c4abcc4 100644 --- a/libsysutils/src/FrameworkCommand.cpp +++ b/libsysutils/src/FrameworkCommand.cpp @@ -18,7 +18,7 @@ #include <errno.h> -#include <android/log.h> +#include <log/log.h> #include <sysutils/FrameworkCommand.h> #define UNUSED __attribute__((unused)) diff --git a/libsysutils/src/FrameworkListener.cpp b/libsysutils/src/FrameworkListener.cpp index b1fb849ff..1b6076fc8 100644 --- a/libsysutils/src/FrameworkListener.cpp +++ b/libsysutils/src/FrameworkListener.cpp @@ -19,8 +19,9 @@ #include <errno.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <sysutils/FrameworkCommand.h> #include <sysutils/FrameworkListener.h> #include <sysutils/SocketClient.h> diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index b78769254..fef801ad0 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -41,7 +41,7 @@ const int LOCAL_QLOG_NL_EVENT = 112; const int LOCAL_NFLOG_PACKET = NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET; -#include <android/log.h> +#include <log/log.h> #include <sysutils/NetlinkEvent.h> NetlinkEvent::NetlinkEvent() { diff --git a/libsysutils/src/NetlinkListener.cpp b/libsysutils/src/NetlinkListener.cpp index 1c4c7df6d..896dad3a6 100644 --- a/libsysutils/src/NetlinkListener.cpp +++ b/libsysutils/src/NetlinkListener.cpp @@ -20,11 +20,12 @@ #include <string.h> #include <sys/socket.h> #include <sys/types.h> +#include <unistd.h> #include <linux/netlink.h> /* out of order because must follow sys/socket.h */ -#include <android/log.h> #include <cutils/uevent.h> +#include <log/log.h> #include <sysutils/NetlinkEvent.h> #if 1 diff --git a/libsysutils/src/ServiceManager.cpp b/libsysutils/src/ServiceManager.cpp index 1abe988a8..13bac0923 100644 --- a/libsysutils/src/ServiceManager.cpp +++ b/libsysutils/src/ServiceManager.cpp @@ -17,10 +17,12 @@ #define LOG_TAG "Service" #include <errno.h> +#include <stdio.h> #include <string.h> +#include <unistd.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <sysutils/ServiceManager.h> ServiceManager::ServiceManager() { diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp index 02505d304..971f90821 100644 --- a/libsysutils/src/SocketClient.cpp +++ b/libsysutils/src/SocketClient.cpp @@ -25,8 +25,9 @@ #include <string.h> #include <sys/socket.h> #include <sys/types.h> +#include <unistd.h> -#include <android/log.h> +#include <log/log.h> #include <sysutils/SocketClient.h> SocketClient::SocketClient(int socket, bool owned) { diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp index 6a676a954..3f8f3db8f 100644 --- a/libsysutils/src/SocketListener.cpp +++ b/libsysutils/src/SocketListener.cpp @@ -24,9 +24,10 @@ #include <sys/time.h> #include <sys/types.h> #include <sys/un.h> +#include <unistd.h> -#include <android/log.h> #include <cutils/sockets.h> +#include <log/log.h> #include <sysutils/SocketListener.h> #include <sysutils/SocketClient.h> |