oem-recovery: Convert librecovery_updater_msm to C++

Newer versions of the updater code in recovery require that oem-extensions
be in C++.

Conflicts:
	recovery/oem-recovery/Android.mk
	recovery/oem-recovery/gpt-utils.cpp
	recovery/oem-recovery/gpt-utils.h

Change-Id: I1cd9bbdca8f2fa4f48e341b955cb81e6bde7f4b1

5 files changed, 15 insertions, 4 deletions

diff --git a/recovery/oem-recovery/Android.mk b/recovery/oem-recovery/Android.mk
index 5b39fec..9cd1f52 100644
--- a/recovery/oem-recovery/Android.mk
+++ b/recovery/oem-recovery/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := bootable/recovery \
 		    system/core/libsparse \
 		    $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_SRC_FILES := gpt-utils.c dec.c oem-updater.c
+LOCAL_SRC_FILES := gpt-utils.cpp dec.cpp oem-updater.cpp
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_MODULE := librecovery_updater_msm
 include $(BUILD_STATIC_LIBRARY)
diff --git a/recovery/oem-recovery/dec.c b/recovery/oem-recovery/dec.cpp
index 5f48f72..a8b1d2c 100644
--- a/recovery/oem-recovery/dec.c
+++ b/recovery/oem-recovery/dec.cpp
@@ -144,7 +144,7 @@ ion_memalloc(struct ion_buf_handle *buf, uint32_t size, uint32_t heap)
         goto ioctl_fail;
     }
 
-    va = mmap(NULL, alloc_data.len, PROT_READ | PROT_WRITE,
+    va = (unsigned char*)mmap(NULL, alloc_data.len, PROT_READ | PROT_WRITE,
               MAP_SHARED, fd_data.fd, 0);
     if (va == MAP_FAILED) {
         fprintf(stderr, "ION memory map failed (%s)\n", strerror(errno));
diff --git a/recovery/oem-recovery/gpt-utils.c b/recovery/oem-recovery/gpt-utils.cpp
index 03967b4..a62f54e 100644
--- a/recovery/oem-recovery/gpt-utils.c
+++ b/recovery/oem-recovery/gpt-utils.cpp
@@ -41,8 +41,13 @@
 #include <unistd.h>
 #include <linux/fs.h>
 #include "gpt-utils.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "sparse_crc32.h"
-
+#ifdef __cplusplus
+}
+#endif
 
 
 /******************************************************************************
diff --git a/recovery/oem-recovery/gpt-utils.h b/recovery/oem-recovery/gpt-utils.h
index 637fb33..93a7c94 100644
--- a/recovery/oem-recovery/gpt-utils.h
+++ b/recovery/oem-recovery/gpt-utils.h
@@ -29,6 +29,9 @@
 
 #ifndef __GPT_UTILS_H__
 #define __GPT_UTILS_H__
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include <unistd.h>
 #include <stdlib.h>
 /******************************************************************************
@@ -47,4 +50,7 @@ enum boot_update_stage {
  ******************************************************************************/
 int prepare_boot_update(enum boot_update_stage stage);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __GPT_UTILS_H__ */
diff --git a/recovery/oem-recovery/oem-updater.c b/recovery/oem-recovery/oem-updater.cpp
index f74da83..4a6c8b4 100644
--- a/recovery/oem-recovery/oem-updater.c
+++ b/recovery/oem-recovery/oem-updater.cpp
@@ -36,7 +36,7 @@
 
 Value* DecryptFn(const char* name, State* state, int argc, Expr* argv[]) {
     int rc = -1;
-    const char *src_file, *dst_file;
+    char *src_file, *dst_file;
 
     if (argc != 2)
         return ErrorAbort(state, "%s expects 2 args, got %d", name, argc);