Merge commit 'b2042f7263c7bbacc5115de4a42c5a96b64a06f2' into HEAD (aad358fb) · Commits · e / os / android_system_core

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -53,3 +53,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.rc)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/reboot)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES/lmkd_intermediates/import_includes)

adb/Android.mk

+1 −3

Original line number	Diff line number	Diff line
		@@ -40,13 +40,11 @@ ifeq ($(HOST_OS),windows)
		ifneq ($(strip $(USE_CYGWIN)),)
		# Pure cygwin case
		LOCAL_LDLIBS += -lpthread -lgdi32
		LOCAL_C_INCLUDES += /usr/include/w32api/ddk
		endif
		ifneq ($(strip $(USE_MINGW)),)
		# MinGW under Linux case
		LOCAL_LDLIBS += -lws2_32 -lgdi32
		USE_SYSDEPS_WIN32 := 1
		LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk
		endif
		LOCAL_C_INCLUDES += development/host/windows/usb/api/
		endif
		@@ -175,7 +173,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

adb/adb.h

+1 −79

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@

		#include <limits.h>

		#include "adb_trace.h"
		#include "transport.h" /* readx(), writex() */

		#define MAX_PAYLOAD 4096
		@@ -337,85 +338,6 @@ void put_apacket(apacket *p);
		int check_header(apacket *p);
		int check_data(apacket *p);

		/* define ADB_TRACE to 1 to enable tracing support, or 0 to disable it */

		#define ADB_TRACE 1

		/* IMPORTANT: if you change the following list, don't
		* forget to update the corresponding 'tags' table in
		* the adb_trace_init() function implemented in adb.c
		*/
		typedef enum {
		TRACE_ADB = 0, /* 0x001 */
		TRACE_SOCKETS,
		TRACE_PACKETS,
		TRACE_TRANSPORT,
		TRACE_RWX, /* 0x010 */
		TRACE_USB,
		TRACE_SYNC,
		TRACE_SYSDEPS,
		TRACE_JDWP, /* 0x100 */
		TRACE_SERVICES,
		TRACE_AUTH,
		} AdbTrace;

		#if ADB_TRACE

		#if !ADB_HOST
		/*
		* When running inside the emulator, guest's adbd can connect to 'adb-debug'
		* qemud service that can display adb trace messages (on condition that emulator
		* has been started with '-debug adb' option).
		*/

		/* Delivers a trace message to the emulator via QEMU pipe. */
		void adb_qemu_trace(const char* fmt, ...);
		/* Macro to use to send ADB trace messages to the emulator. */
		#define DQ(...) adb_qemu_trace(__VA_ARGS__)
		#else
		#define DQ(...) ((void)0)
		#endif /* !ADB_HOST */

		extern int adb_trace_mask;
		extern unsigned char adb_trace_output_count;
		void adb_trace_init(void);

		# define ADB_TRACING ((adb_trace_mask & (1 << TRACE_TAG)) != 0)

		/* you must define TRACE_TAG before using this macro */
		# define D(...) \
		do { \
		if (ADB_TRACING) { \
		int save_errno = errno; \
		adb_mutex_lock(&D_lock); \
		fprintf(stderr, "%s::%s():", \
		__FILE__, __FUNCTION__); \
		errno = save_errno; \
		fprintf(stderr, __VA_ARGS__ ); \
		fflush(stderr); \
		adb_mutex_unlock(&D_lock); \
		errno = save_errno; \
		} \
		} while (0)
		# define DR(...) \
		do { \
		if (ADB_TRACING) { \
		int save_errno = errno; \
		adb_mutex_lock(&D_lock); \
		errno = save_errno; \
		fprintf(stderr, __VA_ARGS__ ); \
		fflush(stderr); \
		adb_mutex_unlock(&D_lock); \
		errno = save_errno; \
		} \
		} while (0)
		#else
		# define D(...) ((void)0)
		# define DR(...) ((void)0)
		# define ADB_TRACING 0
		#endif /* ADB_TRACE */


		#if !DEBUG_PACKETS
		#define print_packet(tag,p) do {} while (0)
		#endif

adb/adb_auth_client.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ static void adb_auth_event(int fd, unsigned events, void *data)

		if (events & FDE_READ) {
		ret = unix_read(fd, response, sizeof(response));
		if (ret < 0) {
		if (ret <= 0) {
		D("Framework disconnect\n");
		if (usb_transport)
		fdevent_remove(&usb_transport->auth_fde);

adb/adb_trace.h

0 → 100644

+143 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef __ADB_TRACE_H
		#define __ADB_TRACE_H

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

		/* define ADB_TRACE to 1 to enable tracing support, or 0 to disable it */
		#define ADB_TRACE 1

		/* IMPORTANT: if you change the following list, don't
		* forget to update the corresponding 'tags' table in
		* the adb_trace_init() function implemented in adb.c
		*/
		typedef enum {
		TRACE_ADB = 0, /* 0x001 */
		TRACE_SOCKETS,
		TRACE_PACKETS,
		TRACE_TRANSPORT,
		TRACE_RWX, /* 0x010 */
		TRACE_USB,
		TRACE_SYNC,
		TRACE_SYSDEPS,
		TRACE_JDWP, /* 0x100 */
		TRACE_SERVICES,
		TRACE_AUTH,
		TRACE_FDEVENT,
		} AdbTrace;

		#if ADB_TRACE

		#if !ADB_HOST
		/*
		* When running inside the emulator, guest's adbd can connect to 'adb-debug'
		* qemud service that can display adb trace messages (on condition that emulator
		* has been started with '-debug adb' option).
		*/

		/* Delivers a trace message to the emulator via QEMU pipe. */
		void adb_qemu_trace(const char* fmt, ...);
		/* Macro to use to send ADB trace messages to the emulator. */
		#define DQ(...) adb_qemu_trace(__VA_ARGS__)
		#else
		#define DQ(...) ((void)0)
		#endif /* !ADB_HOST */

		extern int adb_trace_mask;
		extern unsigned char adb_trace_output_count;
		void adb_trace_init(void);

		# 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) { \
		int save_errno = errno; \
		adb_mutex_lock(&D_lock); \
		fprintf(stderr, "%s::%s():", \
		__FILE__, __FUNCTION__); \
		errno = save_errno; \
		fprintf(stderr, __VA_ARGS__ ); \
		fflush(stderr); \
		adb_mutex_unlock(&D_lock); \
		errno = save_errno; \
		} \
		} while (0)
		# define DR(...) \
		do { \
		if (ADB_TRACING) { \
		int save_errno = errno; \
		adb_mutex_lock(&D_lock); \
		errno = save_errno; \
		fprintf(stderr, __VA_ARGS__ ); \
		fflush(stderr); \
		adb_mutex_unlock(&D_lock); \
		errno = save_errno; \
		} \
		} while (0)
		# define DD(...) \
		do { \
		int save_errno = errno; \
		adb_mutex_lock(&D_lock); \
		fprintf(stderr, "%s::%s():", \
		__FILE__, __FUNCTION__); \
		errno = save_errno; \
		fprintf(stderr, __VA_ARGS__ ); \
		fflush(stderr); \
		adb_mutex_unlock(&D_lock); \
		errno = save_errno; \
		} while (0)
		#else
		# 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)
		# define DD(...) \
		do { \
		__android_log_print( \
		ANDROID_LOG_INFO, \
		__FUNCTION__, \
		__VA_ARGS__ ); \
		} while (0)
		#endif /* ADB_HOST */
		#else
		# define D(...) ((void)0)
		# define DR(...) ((void)0)
		# define DD(...) ((void)0)
		# define ADB_TRACING 0
		#endif /* ADB_TRACE */

		#endif /* __ADB_TRACE_H */