diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-25 07:13:59 +0100 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 07:13:59 +0100 |
| commit | 6deb3d5cf266ce18aefb819c5994f504e0df103b (patch) | |
| tree | 7d6406d88d4d2bd63dfe51df080c8ad4c66c4262 | |
| parent | am 829d392a: Merge "Delete unused functions from minzip." (diff) | |
| parent | Merge "Fix build from implicit declaration." (diff) | |
| download | android_bootable_recovery-6deb3d5cf266ce18aefb819c5994f504e0df103b.tar android_bootable_recovery-6deb3d5cf266ce18aefb819c5994f504e0df103b.tar.gz android_bootable_recovery-6deb3d5cf266ce18aefb819c5994f504e0df103b.tar.bz2 android_bootable_recovery-6deb3d5cf266ce18aefb819c5994f504e0df103b.tar.lz android_bootable_recovery-6deb3d5cf266ce18aefb819c5994f504e0df103b.tar.xz android_bootable_recovery-6deb3d5cf266ce18aefb819c5994f504e0df103b.tar.zst android_bootable_recovery-6deb3d5cf266ce18aefb819c5994f504e0df103b.zip | |
| -rw-r--r-- | minadbd/Android.mk | 22 | ||||
| -rw-r--r-- | minadbd/adb_main.c | 4 | ||||
| -rw-r--r-- | minadbd/fuse_adb_provider.c | 1 | ||||
| -rw-r--r-- | minadbd/services.c | 14 |
4 files changed, 23 insertions, 18 deletions
diff --git a/minadbd/Android.mk b/minadbd/Android.mk index f4b060b47..dce004feb 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -1,22 +1,22 @@ # Copyright 2005 The Android Open Source Project -# -# Android.mk for adb -# LOCAL_PATH:= $(call my-dir) -# minadbd library -# ========================================================= - include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb_main.c \ - fuse_adb_provider.c \ - services.c \ + adb_main.c \ + fuse_adb_provider.c \ + services.c \ + +LOCAL_CFLAGS := \ + -Wall -Werror \ + -Wno-unused-parameter \ + -Wimplicit-function-declaration \ + -D_GNU_SOURCE \ + -D_XOPEN_SOURCE \ + -DADB_HOST=0 \ -LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE LOCAL_C_INCLUDES := bootable/recovery system/core/adb LOCAL_WHOLE_STATIC_LIBRARIES := libadbd diff --git a/minadbd/adb_main.c b/minadbd/adb_main.c index a62881d88..f6e240108 100644 --- a/minadbd/adb_main.c +++ b/minadbd/adb_main.c @@ -21,9 +21,11 @@ #define TRACE_TAG TRACE_ADB -#include "adb.h" #include "sysdeps.h" +#include "adb.h" +#include "transport.h" + int adb_main(int is_daemon, int server_port) { atexit(usb_cleanup); diff --git a/minadbd/fuse_adb_provider.c b/minadbd/fuse_adb_provider.c index e9262858c..2386e82bb 100644 --- a/minadbd/fuse_adb_provider.c +++ b/minadbd/fuse_adb_provider.c @@ -21,6 +21,7 @@ #include "adb.h" #include "fuse_sideload.h" +#include "transport.h" struct adb_data { int sfd; // file descriptor for the adb channel diff --git a/minadbd/services.c b/minadbd/services.c index 357c222b4..7e419cc85 100644 --- a/minadbd/services.c +++ b/minadbd/services.c @@ -14,18 +14,19 @@ * limitations under the License. */ -#include <stdlib.h> +#include <errno.h> +#include <inttypes.h> #include <stdio.h> -#include <unistd.h> +#include <stdlib.h> #include <string.h> -#include <errno.h> +#include <unistd.h> #include "sysdeps.h" -#include "fdevent.h" -#include "fuse_adb_provider.h" #define TRACE_TAG TRACE_SERVICES #include "adb.h" +#include "fdevent.h" +#include "fuse_adb_provider.h" typedef struct stinfo stinfo; @@ -52,7 +53,8 @@ static void sideload_host_service(int sfd, void* cookie) s = adb_strtok_r(NULL, ":", &saveptr); 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); |