diff options
| author | Colin Cross <ccross@android.com> | 2013-07-23 16:59:20 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-07-24 12:32:39 -0700 |
| commit | 9227bd385504ace739d4451a6c5dc3d777b5bf21 (patch) | |
| tree | 355484e01ff5efa0be976905767fc7126a678cb6 /adb | |
| parent | 87bc464a9f62f026fd841d3b54cfb1a5d57d83a3 (diff) | |
| download | system_core-9227bd385504ace739d4451a6c5dc3d777b5bf21.zip system_core-9227bd385504ace739d4451a6c5dc3d777b5bf21.tar.gz system_core-9227bd385504ace739d4451a6c5dc3d777b5bf21.tar.bz2 | |
Move liblog headers to system/core/include/log
Move the liblog headers to log/ instead of cutils/ to complete
the separation of libcutils and liblog. cutils/log.h still
exists and includes log/log.h in order to support the many existing
modules that use cutils/log.h.
Change-Id: I2758c9f4aedcb809ca7ba8383d0f55041dd44345
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/Android.mk | 2 | ||||
| -rw-r--r-- | adb/log_service.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 36f595b..721b48d 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -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) diff --git a/adb/log_service.c b/adb/log_service.c index 6e9bdee..af24356 100644 --- a/adb/log_service.c +++ b/adb/log_service.c @@ -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" |