am 35fbf787: Merge "Fix build from implicit declaration." (6deb3d5c) · Commits · e / tools / etwrp

minadbd/Android.mk

+11 −11

Original line number	Original line	Diff line number	Diff line
	# Copyright 2005 The Android Open Source Project		# Copyright 2005 The Android Open Source Project
	#
	# Android.mk for adb
	#

	LOCAL_PATH:= $(call my-dir)		LOCAL_PATH:= $(call my-dir)

	# minadbd library
	# =========================================================

	include $(CLEAR_VARS)		include $(CLEAR_VARS)

	LOCAL_SRC_FILES := \		LOCAL_SRC_FILES := \
	@@ -15,8 +9,14 @@ LOCAL_SRC_FILES := \
	fuse_adb_provider.c \		fuse_adb_provider.c \
	services.c \		services.c \

	LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter		LOCAL_CFLAGS := \
	LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE		-Wall -Werror \
			-Wno-unused-parameter \
			-Wimplicit-function-declaration \
			-D_GNU_SOURCE \
			-D_XOPEN_SOURCE \
			-DADB_HOST=0 \

	LOCAL_C_INCLUDES := bootable/recovery system/core/adb		LOCAL_C_INCLUDES := bootable/recovery system/core/adb
	LOCAL_WHOLE_STATIC_LIBRARIES := libadbd		LOCAL_WHOLE_STATIC_LIBRARIES := libadbd

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,9 +21,11 @@

	#define TRACE_TAG TRACE_ADB		#define TRACE_TAG TRACE_ADB

	#include "adb.h"
	#include "sysdeps.h"		#include "sysdeps.h"

			#include "adb.h"
			#include "transport.h"

	int adb_main(int is_daemon, int server_port)		int adb_main(int is_daemon, int server_port)
	{		{
	atexit(usb_cleanup);		atexit(usb_cleanup);

+1 −0

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

	#include "adb.h"		#include "adb.h"
	#include "fuse_sideload.h"		#include "fuse_sideload.h"
			#include "transport.h"

	struct adb_data {		struct adb_data {
	int sfd; // file descriptor for the adb channel		int sfd; // file descriptor for the adb channel

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -14,18 +14,19 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	#include <stdlib.h>		#include <errno.h>
			#include <inttypes.h>
	#include <stdio.h>		#include <stdio.h>
	#include <unistd.h>		#include <stdlib.h>
	#include <string.h>		#include <string.h>
	#include <errno.h>		#include <unistd.h>

	#include "sysdeps.h"		#include "sysdeps.h"
	#include "fdevent.h"
	#include "fuse_adb_provider.h"

	#define TRACE_TAG TRACE_SERVICES		#define TRACE_TAG TRACE_SERVICES
	#include "adb.h"		#include "adb.h"
			#include "fdevent.h"
			#include "fuse_adb_provider.h"

	typedef struct stinfo stinfo;		typedef struct stinfo stinfo;

	@@ -52,7 +53,8 @@ static void sideload_host_service(int sfd, void* cookie)
	s = adb_strtok_r(NULL, ":", &saveptr);		s = adb_strtok_r(NULL, ":", &saveptr);
	uint32_t block_size = strtoul(s, NULL, 10);		uint32_t block_size = strtoul(s, NULL, 10);

	printf("sideload-host file size %llu block size %lu\n", file_size, block_size);		printf("sideload-host file size %llu block size %" PRIu32 "\n", file_size,
			block_size);

	int result = run_adb_fuse(sfd, file_size, block_size);		int result = run_adb_fuse(sfd, file_size, block_size);