diff options
| author | Tao Bao <tbao@google.com> | 2015-08-08 05:29:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-08 05:29:22 +0000 |
| commit | e74ffc4d1a9fe0bb607f9e05789cd412fdda650e (patch) | |
| tree | 5a030058d65832cc82ab5b0821a12b94894e2ace | |
| parent | bdade758bda1cef9f31219287e44430d3b2c3210 (diff) | |
| parent | 0f3e75d8c63b6c3eedef9dd2f67a5810da3a35ca (diff) | |
| download | tilapia-e74ffc4d1a9fe0bb607f9e05789cd412fdda650e.tar.gz | |
Merge "updater: Switch to C++ and fix the build."HEADandroid-m-preview-2mastermain
| -rw-r--r-- | recovery/Android.mk | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | recovery/lib/downloadFN.h | 8 | ||||
| -rw-r--r-- | recovery/recovery_updater.cpp (renamed from recovery/recovery_updater.c) | 0 |
3 files changed, 9 insertions, 1 deletions
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_MODULE_TAGS := eng 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 diff --git a/recovery/lib/downloadFN.h b/recovery/lib/downloadFN.h index b8cb0a7..a8a2f63 100755..100644 --- 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 SetHighPerformance(); void ResetModem(); int DownloadFiles(char* file); +#ifdef __cplusplus +} +#endif + #endif diff --git a/recovery/recovery_updater.c b/recovery/recovery_updater.cpp index d75ac0b..d75ac0b 100644 --- a/recovery/recovery_updater.c +++ b/recovery/recovery_updater.cpp |