diff options
| author | Colin Cross <ccross@android.com> | 2013-07-25 21:39:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-25 21:39:24 +0000 |
| commit | 44f5c157240bd9ba3077ca7f444fee4ea56ce5cf (patch) | |
| tree | 242d5a2faeb02e64fec149f22380067c620989b8 /adb | |
| parent | b815810f477aa39e28705dda1713152927e5adc6 (diff) | |
| parent | 9227bd385504ace739d4451a6c5dc3d777b5bf21 (diff) | |
| download | system_core-44f5c157240bd9ba3077ca7f444fee4ea56ce5cf.zip system_core-44f5c157240bd9ba3077ca7f444fee4ea56ce5cf.tar.gz system_core-44f5c157240bd9ba3077ca7f444fee4ea56ce5cf.tar.bz2 | |
Merge "Move liblog headers to system/core/include/log"
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" |