commit 7c511184bf3ed44f3590027730a64d565c0e12ee
author Tao Bao <tbao@google.com> Mon Aug 10 17:23:13 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 10 17:23:13 2015 +0000
tree f06f32b0db7a162ec7c33170d1f4b87454762962
parent e67104a6a778f70bd479e737b09eb32c835e250e
parent e6aa3326c1dbebac95eebc320d2c419f0ae9f9b9

Merge "updater: Clean up char* with std::string."

edify/Android.mk

diff --git a/edify/Android.mk b/edify/Android.mk
index c366450..eb366c2 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -21,10 +21,10 @@
 		$(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 @@
 
 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
 

minadbd/adb_main.cpp

diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index 724f39c..514f196 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);

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 8123903..515470f 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -942,7 +942,7 @@
     // 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;
     }