diff options
| author | Milos Ratkovic <milosr@gmail.com> | 2016-08-24 21:12:25 +0200 |
|---|---|---|
| committer | Milos Ratkovic <milosr@gmail.com> | 2016-08-24 21:12:25 +0200 |
| commit | 6535b9556718e9085dccf9ae501cdc787625330a (patch) | |
| tree | be856507497ab65e2adb47434d63eb0c43b235d0 | |
| parent | 3776d5b53b4fa3d2e000eee5f2799573874f4e63 (diff) | |
changes for android 7.0
| -rw-r--r-- | BoardConfig.mk | 3 | ||||
| -rw-r--r-- | recovery/Android.mk | 2 | ||||
| -rwxr-xr-x | recovery/lib/downloadFN.h | 8 | ||||
| -rw-r--r-- | recovery/recovery_updater.cpp (renamed from recovery/recovery_updater.c) | 7 |
4 files changed, 14 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 1e331cdfd11..9b32501a3e0 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -42,4 +42,5 @@ include device/asus/grouper/BoardConfigCommon.mk TARGET_RECOVERY_FSTAB = device/asus/tilapia/fstab.grouper -MALLOC_IMPL := dlmalloc +MALLOC_SVELTE := true + diff --git a/recovery/Android.mk b/recovery/Android.mk index 9475448e577..46fc7a3ee77 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 b8cb0a7510a..a8a2f634901 100755 --- 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 d75ac0bf8f1..95f85e21810 100644 --- a/recovery/recovery_updater.c +++ b/recovery/recovery_updater.cpp @@ -30,10 +30,9 @@ #include "cutils/misc.h" #include "cutils/properties.h" #include "edify/expr.h" -#include "mincrypt/sha.h" -#include "minzip/DirUtil.h" -#include "mtdutils/mounts.h" -#include "mtdutils/mtdutils.h" +/* #include "mincrypt/sha.h" +#include "minzip/DirUtil.h" +#include "mounts.h" */ #include "downloadFN.h" Value* DownloadModemFn(const char* name, State* state, int argc, Expr* argv[]) { |