Merge "Redirect debug output to logcat." into lmp-dev (5a255238) · Commits · e / os / android_system_core

adb/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@ LOCAL_C_INCLUDES += external/openssl/include

		LOCAL_MODULE := adb

		LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils
		LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils liblog

		LOCAL_SHARED_LIBRARIES := libcrypto

+25 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@
		#ifndef __ADB_H
		#define __ADB_H

		#if !ADB_HOST
		#include <android/log.h>
		#endif
		#include <limits.h>

		#include "transport.h" /* readx(), writex() */
		@@ -383,6 +386,26 @@ void adb_qemu_trace(const char* fmt, ...);
		# define ADB_TRACING ((adb_trace_mask & (1 << TRACE_TAG)) != 0)

		/* 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(...) \
		do { \
		if (ADB_TRACING) { \
		@@ -409,6 +432,7 @@ void adb_qemu_trace(const char* fmt, ...);
		errno = save_errno; \
		} \
		} while (0)
		#endif
		#else
		# define D(...) ((void)0)
		# define DR(...) ((void)0)