diff options
| -rw-r--r-- | edify/Android.mk | 8 | ||||
| -rw-r--r-- | minadbd/adb_main.cpp | 2 | ||||
| -rw-r--r-- | recovery.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/edify/Android.mk b/edify/Android.mk index c36645045..eb366c287 100644 --- a/edify/Android.mk +++ b/edify/Android.mk @@ -21,10 +21,10 @@ LOCAL_SRC_FILES := \ $(edify_src_files) \ main.c -LOCAL_CFLAGS := $(edify_cflags) -g -O0 +LOCAL_CPPFLAGS := $(edify_cflags) -g -O0 LOCAL_MODULE := edify LOCAL_YACCFLAGS := -v -LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CPPFLAGS += -Wno-unused-parameter LOCAL_CLANG := true include $(BUILD_HOST_EXECUTABLE) @@ -36,8 +36,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(edify_src_files) -LOCAL_CFLAGS := $(edify_cflags) -LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CPPFLAGS := $(edify_cflags) +LOCAL_CPPFLAGS += -Wno-unused-parameter LOCAL_MODULE := libedify LOCAL_CLANG := true diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp index 724f39c1d..514f19699 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/adb_main.cpp @@ -27,7 +27,7 @@ #include "adb_auth.h" #include "transport.h" -int adb_main(int is_daemon, int server_port) { +int adb_main(int is_daemon, int server_port, int /* reply_fd */) { adb_device_banner = "sideload"; signal(SIGPIPE, SIG_IGN); diff --git a/recovery.cpp b/recovery.cpp index 8123903ae..515470f96 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -942,7 +942,7 @@ main(int argc, char **argv) { // only way recovery should be run with this argument is when it // starts a copy of itself from the apply_from_adb() function. if (argc == 2 && strcmp(argv[1], "--adbd") == 0) { - adb_main(0, DEFAULT_ADB_PORT); + adb_main(0, DEFAULT_ADB_PORT, -1); return 0; } |