commit e74ffc4d1a9fe0bb607f9e05789cd412fdda650e
author Tao Bao <tbao@google.com> Sat Aug 08 05:29:22 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Aug 08 05:29:22 2015 +0000
tree 5a030058d65832cc82ab5b0821a12b94894e2ace
parent bdade758bda1cef9f31219287e44430d3b2c3210
parent 0f3e75d8c63b6c3eedef9dd2f67a5810da3a35ca

Merge "updater: Switch to C++ and fix the build."

recovery/Android.mk

diff --git a/recovery/Android.mk b/recovery/Android.mk
index 9475448..46fc7a3 100644
--- a/recovery/Android.mk
+++ b/recovery/Android.mk
@@ -21,7 +21,7 @@
 LOCAL_C_INCLUDES += bootable/recovery \
                     device/asus/tilapia/recovery/lib
 
-LOCAL_SRC_FILES := recovery_updater.c
+LOCAL_SRC_FILES := recovery_updater.cpp
 
 LOCAL_STATIC_LIBRARIES := libIMCdownload libPrgHandler
 

recovery/lib/downloadFN.h

diff --git a/recovery/lib/downloadFN.h b/recovery/lib/downloadFN.h
old mode 100755
new mode 100644
index b8cb0a7..a8a2f63
--- a/recovery/lib/downloadFN.h
+++ b/recovery/lib/downloadFN.h
@@ -1,6 +1,10 @@
 #ifndef _DOWNLOADFN_H
 #define _DOWNLOADFN_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void SetBaudrate(int baudrate);
 void SetComPort(char *comport);
 void SetTraceFile(char *filepath);
@@ -9,4 +13,8 @@
 void ResetModem();
 int DownloadFiles(char* file);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

recovery/recovery_updater.cpp

diff --git a/recovery/recovery_updater.c b/recovery/recovery_updater.cpp
similarity index 100%
rename from recovery/recovery_updater.c
rename to recovery/recovery_updater.cpp