Merge "Remove confusing variable HOST." (317acfb8) · Commits · e / os / android_system_core

adb/adb.cpp

+9 −5

Original line number	Diff line number	Diff line
		@@ -55,8 +55,6 @@

		ADB_MUTEX_DEFINE(D_lock);

		int HOST = 0;

		#if !ADB_HOST
		const char* adb_device_banner = "device";
		static android::base::LogdLogger gLogdLogger;
		@@ -423,7 +421,9 @@ void handle_packet(apacket p, atransport t)
		case A_SYNC:
		if(p->msg.arg0){
		send_packet(p, t);
		if(HOST) send_connect(t);
		#if ADB_HOST
		send_connect(t);
		#endif
		} else {
		t->connection_state = kCsOffline;
		handle_offline(t);
		@@ -440,12 +440,16 @@ void handle_packet(apacket p, atransport t)
		t->update_version(p->msg.arg0, p->msg.arg1);
		parse_banner(reinterpret_cast<const char*>(p->data), t);

		if (HOST \|\| !auth_required) {
		#if ADB_HOST
		handle_online(t);
		if (!HOST) send_connect(t);
		#else
		if (!auth_required) {
		handle_online(t);
		send_connect(t);
		} else {
		send_auth_request(t);
		}
		#endif
		break;

		case A_AUTH:

adb/adb.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,6 @@ int adb_commandline(int argc, const char **argv);
		ConnectionState connection_state(atransport *t);

		extern const char *adb_device_banner;
		extern int HOST;
		#if !ADB_HOST
		extern int SHELL_EXIT_NOTIFY_FD;
		#endif // !ADB_HOST

adb/client/main.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -137,8 +137,6 @@ static void setup_daemon_logging(void) {
		}

		int adb_main(int is_daemon, int server_port, int ack_reply_fd) {
		HOST = 1;

		#if defined(_WIN32)
		SetConsoleCtrlHandler(ctrlc_handler, TRUE);
		#else

adb/services.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -465,9 +465,9 @@ int service_to_fd(const char *name)
		ret = create_service_thread(framebuffer_service, 0);
		} else if (!strncmp(name, "jdwp:", 5)) {
		ret = create_jdwp_connection_fd(atoi(name+5));
		} else if(!HOST && !strncmp(name, "shell:", 6)) {
		} else if(!strncmp(name, "shell:", 6)) {
		ret = create_subproc_thread(name + 6, true);
		} else if(!HOST && !strncmp(name, "exec:", 5)) {
		} else if(!strncmp(name, "exec:", 5)) {
		ret = create_subproc_thread(name + 5);
		} else if(!strncmp(name, "sync:", 5)) {
		ret = create_service_thread(file_sync_service, NULL);

adb/transport_local.cpp

+28 −33

Original line number	Diff line number	Diff line
		@@ -120,10 +120,9 @@ int local_connect_arbitrary_ports(int console_port, int adb_port, std::string* e
		return -1;
		}


		#if ADB_HOST
		static void client_socket_thread(void x)
		{
		#if ADB_HOST
		D("transport: client_socket_thread() starting\n");
		while (true) {
		int port = DEFAULT_ADB_LOCAL_TRANSPORT_PORT;
		@@ -135,10 +134,11 @@ static void client_socket_thread(void x)
		}
		sleep(1);
		}
		#endif
		return 0;
		}

		#else // ADB_HOST

		static void server_socket_thread(void arg)
		{
		int serverfd, fd;
		@@ -175,7 +175,6 @@ static void server_socket_thread(void arg)
		}

		/* This is relevant only for ADB daemon running inside the emulator. */
		#if !ADB_HOST
		/*
		* Redefine open and write for qemu_pipe.h that contains inlined references
		* to those routines. We will redifine them back after qemu_pipe.h inclusion.
		@@ -287,12 +286,11 @@ static const char _ok_resp[] = "ok";
		void local_init(int port)
		{
		void* (func)(void );
		const char* debug_name = "";

		if(HOST) {
		func = client_socket_thread;
		} else {
		#if ADB_HOST
		func = server_socket_thread;
		func = client_socket_thread;
		debug_name = "client";
		#else
		/* For the adbd daemon in the system image we need to distinguish
		* between the device, and the emulator. */
		@@ -305,13 +303,12 @@ void local_init(int port)
		/* Running inside the device: use TCP socket as the transport. */
		func = server_socket_thread;
		}
		debug_name = "server";
		#endif // !ADB_HOST
		}

		D("transport: local %s init\n", HOST ? "client" : "server");

		D("transport: local %s init\n", debug_name);
		if (!adb_thread_create(func, (void *) (uintptr_t) port)) {
		fatal_errno("cannot create local socket %s thread", HOST ? "client" : "server");
		fatal_errno("cannot create local socket %s thread", debug_name);
		}
		}

		@@ -323,7 +320,6 @@ static void remote_kick(atransport *t)
		adb_close(fd);

		#if ADB_HOST
		if(HOST) {
		int nn;
		adb_mutex_lock( &local_transports_lock );
		for (nn = 0; nn < ADB_LOCAL_TRANSPORT_MAX; nn++) {
		@@ -333,7 +329,6 @@ static void remote_kick(atransport *t)
		}
		}
		adb_mutex_unlock( &local_transports_lock );
		}
		#endif
		}

		@@ -404,7 +399,7 @@ int init_socket_transport(atransport *t, int s, int adb_port, int local)
		t->adb_port = 0;

		#if ADB_HOST
		if (HOST && local) {
		if (local) {
		adb_mutex_lock( &local_transports_lock );
		{
		t->adb_port = adb_port;