Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fd2eaf8 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

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

am: f56fce02

Change-Id: I588c3a252594e1ecd4b34242217cf23c84e4af67
parents c528ac0f f56fce02

include/cutils/log.h

+1 −1
Original line number Diff line number Diff line 
#include <log/log.h>
 
#include <android/log.h>

libcutils/ashmem-dev.c

+2 −3
Original line number Diff line number Diff line
@@ -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"

libcutils/debugger.c

+5 −5
Original line number Diff line number Diff line
@@ -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) {

libcutils/dlmalloc_stubs.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "log/log.h"

#include "android/log.h"



#define UNUSED __attribute__((__unused__))

libcutils/fs.c

+9 −9
Original line number Diff line number Diff line
@@ -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