ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Redirect debug output to logcat." into lmp-dev

Browse source
This commit is contained in:
leozwang 2014-07-25 16:36:56 +00:00 • committed by Android (Google) Code Review
commit 5a2552388e
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/Android.mk
View file

@ -167,7 +167,7 @@ LOCAL_C_INCLUDES += external/openssl/include
LOCAL_MODULE := adb LOCAL_MODULE := adb
LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils liblog
LOCAL_SHARED_LIBRARIES := libcrypto LOCAL_SHARED_LIBRARIES := libcrypto

26
adb/adb.h
View file

@ -17,6 +17,9 @@
#ifndef __ADB_H #ifndef __ADB_H
#define __ADB_H #define __ADB_H
#if !ADB_HOST
#include <android/log.h>
#endif
#include <limits.h> #include <limits.h>
#include "transport.h" /* readx(), writex() */ #include "transport.h" /* readx(), writex() */
@ -382,7 +385,27 @@ void adb_qemu_trace(const char* fmt, ...);
# define ADB_TRACING ((adb_trace_mask & (1 << TRACE_TAG)) != 0) # define ADB_TRACING ((adb_trace_mask & (1 << TRACE_TAG)) != 0)
/* you must define TRACE_TAG before using this macro */ /* you must define TRACE_TAG before using this macro */
#if !ADB_HOST
# define D(...) \
do { \
if (ADB_TRACING) { \
__android_log_print( \
ANDROID_LOG_INFO, \
__FUNCTION__, \
__VA_ARGS__ ); \
} \
} while (0)
# define DR(...) \
do { \
if (ADB_TRACING) { \
__android_log_print( \
ANDROID_LOG_INFO, \
__FUNCTION__, \
__VA_ARGS__ ); \
} \
} while (0)
#else
# define D(...) \ # define D(...) \
do { \ do { \
if (ADB_TRACING) { \ if (ADB_TRACING) { \
@ -409,6 +432,7 @@ void adb_qemu_trace(const char* fmt, ...);
errno = save_errno; \ errno = save_errno; \
} \ } \
} while (0) } while (0)
#endif
#else #else
# define D(...) ((void)0) # define D(...) ((void)0)
# define DR(...) ((void)0) # define DR(...) ((void)0)