diff options
| author | Tao Bao <tbao@google.com> | 2015-08-08 05:15:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-08 05:15:47 +0000 |
| commit | 347c52a53fa21a732e2e09b0a1f7e0b97e5e417f (patch) | |
| tree | 6ea219b0820b5d7a51b9a2eab458c202e273fed7 | |
| parent | 8d912f9acf6f2cdb5529aa1cee870cf4106b1389 (diff) | |
| parent | cea24ef528eb4f8ecd2061e21c78d764ae370c00 (diff) | |
| download | manta-347c52a53fa21a732e2e09b0a1f7e0b97e5e417f.tar.gz | |
Merge "updater: Switch to C++ and fix the build."android-m-preview-2
| -rw-r--r-- | recovery/Android.mk | 2 | ||||
| -rw-r--r-- | recovery/recovery_updater.cpp (renamed from recovery/recovery_updater.c) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recovery/Android.mk b/recovery/Android.mk index 71d4815..277f5c6 100644 --- a/recovery/Android.mk +++ b/recovery/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES += bootable/recovery -LOCAL_SRC_FILES := recovery_updater.c +LOCAL_SRC_FILES := recovery_updater.cpp # should match TARGET_RECOVERY_UPDATER_LIBS set in BoardConfig.mk LOCAL_MODULE := librecovery_updater_manta diff --git a/recovery/recovery_updater.c b/recovery/recovery_updater.cpp index 8da6165..c7f713e 100644 --- a/recovery/recovery_updater.c +++ b/recovery/recovery_updater.cpp @@ -179,7 +179,7 @@ Value* WriteBootloaderFn(const char* name, State* state, int argc, Expr* argv[]) return ErrorAbort(state, "%s(): argument types are incorrect", name); } - result = update_bootloader(img->data, img->size, + result = update_bootloader(reinterpret_cast<unsigned char*>(img->data), img->size, block_loc->data, force_ro_loc->data); FreeValue(img); FreeValue(block_loc); |