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

Commit 44f5c157 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Move liblog headers to system/core/include/log"

parents b815810f 9227bd38

adb/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true 
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)

LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)



LOCAL_STATIC_LIBRARIES := libcutils libc libmincrypt

LOCAL_STATIC_LIBRARIES := liblog libcutils libc libmincrypt

include $(BUILD_EXECUTABLE)

adb/log_service.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <fcntl.h>

#include <errno.h>

#include <sys/socket.h>

#include <cutils/logger.h>

#include <log/logger.h>

#include "sysdeps.h"

#include "adb.h"

debuggerd/debuggerd.c

+3 −2
Original line number Diff line number Diff line
@@ -31,9 +31,10 @@ 
#include <sys/stat.h>

#include <sys/poll.h>



#include <log/logd.h>

#include <log/logger.h>



#include <cutils/sockets.h>

#include <cutils/logd.h>

#include <cutils/logger.h>

#include <cutils/properties.h>

#include <cutils/debugger.h>

debuggerd/tombstone.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#include <private/android_filesystem_config.h>



#include <cutils/logger.h>

#include <log/logger.h>

#include <cutils/properties.h>



#include <corkscrew/demangle.h>

debuggerd/utility.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <errno.h>

#include <unistd.h>

#include <signal.h>

#include <cutils/logd.h>

#include <log/logd.h>

#include <sys/ptrace.h>

#include <sys/wait.h>

#include <arpa/inet.h>