libcutils: Replace cutils/log.h with android/log.h am: 23ed4c242a

am: f56fce0240

Change-Id: I588c3a252594e1ecd4b34242217cf23c84e4af67
This commit is contained in:
Mark Salyzyn 2016-09-30 22:12:45 +00:00 committed by android-build-merger
commit 9fd2eaf827
14 changed files with 43 additions and 42 deletions

View File

@ -1 +1 @@
#include <log/log.h>
#include <android/log.h>

View File

@ -23,6 +23,7 @@
#include <errno.h>
#include <fcntl.h>
#include <linux/ashmem.h>
#include <pthread.h>
#include <string.h>
#include <sys/ioctl.h>
@ -30,10 +31,8 @@
#include <sys/types.h>
#include <unistd.h>
#include <linux/ashmem.h>
#include <android/log.h>
#include <cutils/ashmem.h>
#include <log/log.h>
#define ASHMEM_DEVICE "/dev/ashmem"

View File

@ -14,21 +14,21 @@
* limitations under the License.
*/
#include <stdbool.h>
#define LOG_TAG "DEBUG"
#include <fcntl.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
#include <android/log.h>
#include <cutils/debugger.h>
#include <cutils/sockets.h>
#define LOG_TAG "DEBUG"
#include <log/log.h>
static int send_request(int sock_fd, void* msg_ptr, size_t msg_len) {
int result = 0;
if (TEMP_FAILURE_RETRY(write(sock_fd, msg_ptr, msg_len)) != (ssize_t) msg_len) {

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "log/log.h"
#include "android/log.h"
#define UNUSED __attribute__((__unused__))

View File

@ -21,18 +21,18 @@
#define _ATFILE_SOURCE 1
#define _GNU_SOURCE 1
#include <cutils/fs.h>
#include <cutils/log.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>
#include <string.h>
#include <fcntl.h>
#include <limits.h>
#include <stdlib.h>
#include <dirent.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <android/log.h>
#include <cutils/fs.h>
#define ALL_PERMS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
#define BUF_SIZE 64

View File

@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <log/log.h>
#include <android/log.h>
#include <private/android_filesystem_config.h>
#include <utils/Compat.h>

View File

@ -16,13 +16,13 @@
#define LOG_TAG "NativeHandle"
#include <stdint.h>
#include <errno.h>
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <cutils/log.h>
#include <android/log.h>
#include <cutils/native_handle.h>
static const int kMaxNativeFds = 1024;

View File

@ -17,18 +17,18 @@
#define LOG_TAG "properties"
// #define LOG_NDEBUG 0
#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <unistd.h>
#include <cutils/sockets.h>
#include <errno.h>
#include <assert.h>
#include <android/log.h>
#include <cutils/properties.h>
#include <stdbool.h>
#include <inttypes.h>
#include <log/log.h>
#include <cutils/sockets.h>
int8_t property_get_bool(const char *key, int8_t default_value) {
if (!key) {

View File

@ -26,8 +26,8 @@
#include <string.h>
#include <unistd.h>
#include <android/log.h>
#include <cutils/qtaguid.h>
#include <log/log.h>
static const char* CTRL_PROCPATH = "/proc/net/xt_qtaguid/ctrl";
static const int CTRL_MAX_INPUT_LEN = 128;

View File

@ -23,8 +23,8 @@
#include <string.h>
#include <unistd.h>
#include <android/log.h>
#include <cutils/sched_policy.h>
#include <log/log.h>
#define UNUSED __attribute__((__unused__))

View File

@ -18,7 +18,7 @@
#include <sys/uio.h>
#include <log/log.h>
#include <android/log.h>
#if defined(__ANDROID__)
/* For the socket trust (credentials) check */

View File

@ -24,10 +24,10 @@
#include <stdlib.h>
#include <string.h>
#include <android/log.h>
#include <cutils/hashmap.h>
#include <cutils/memory.h>
#include <cutils/str_parms.h>
#include <log/log.h>
#define UNUSED __attribute__((unused))

View File

@ -15,16 +15,17 @@
*/
#define LOG_TAG "Properties_test"
#include <cutils/log.h>
#include <gtest/gtest.h>
#include <cutils/properties.h>
#include <limits.h>
#include <string>
#include <sstream>
#include <iostream>
#include <iostream>
#include <sstream>
#include <string>
#include <android/log.h>
#include <android-base/macros.h>
#include <cutils/properties.h>
#include <gtest/gtest.h>
namespace android {

View File

@ -14,6 +14,8 @@
* limitations under the License.
*/
#define LOG_TAG "cutils-trace"
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
@ -27,8 +29,7 @@
#include <cutils/properties.h>
#include <cutils/trace.h>
#define LOG_TAG "cutils-trace"
#include <log/log.h>
#include <android/log.h>
/**
* Maximum size of a message that can be logged to the trace buffer.