diff options
| author | Jed Estep <jestep@google.com> | 2016-03-21 22:37:33 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-21 22:37:33 +0100 |
| commit | 6f7876816b2322169432658235ebf7882ced0564 (patch) | |
| tree | 596945143de9306b9e53163aef466cc8b5f429e5 /updater | |
| parent | Merge "Fix: full ota package larger than 2GB fails to upgrade" (diff) | |
| parent | Control fault injection with config files instead of build flags (diff) | |
| download | android_bootable_recovery-6f7876816b2322169432658235ebf7882ced0564.tar android_bootable_recovery-6f7876816b2322169432658235ebf7882ced0564.tar.gz android_bootable_recovery-6f7876816b2322169432658235ebf7882ced0564.tar.bz2 android_bootable_recovery-6f7876816b2322169432658235ebf7882ced0564.tar.lz android_bootable_recovery-6f7876816b2322169432658235ebf7882ced0564.tar.xz android_bootable_recovery-6f7876816b2322169432658235ebf7882ced0564.tar.zst android_bootable_recovery-6f7876816b2322169432658235ebf7882ced0564.zip | |
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/blockimg.cpp | 2 | ||||
| -rw-r--r-- | updater/install.cpp | 2 | ||||
| -rw-r--r-- | updater/updater.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 44de4e031..56378d4f5 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -45,7 +45,7 @@ #include "install.h" #include "openssl/sha.h" #include "minzip/Hash.h" -#include "otafault/ota_io.h" +#include "ota_io.h" #include "print_sha1.h" #include "unique_fd.h" #include "updater.h" diff --git a/updater/install.cpp b/updater/install.cpp index 413e147a1..bc4cca913 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -51,7 +51,7 @@ #include "minzip/DirUtil.h" #include "mtdutils/mounts.h" #include "mtdutils/mtdutils.h" -#include "otafault/ota_io.h" +#include "ota_io.h" #include "updater.h" #include "install.h" #include "tune2fs.h" diff --git a/updater/updater.cpp b/updater/updater.cpp index ddc01e125..1693fa1db 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -25,6 +25,7 @@ #include "blockimg.h" #include "minzip/Zip.h" #include "minzip/SysUtil.h" +#include "config.h" // Generated by the makefile, this function defines the // RegisterDeviceExtensions() function, which calls all the @@ -84,6 +85,7 @@ int main(int argc, char** argv) { argv[3], strerror(err)); return 3; } + ota_io_init(&za); const ZipEntry* script_entry = mzFindZipEntry(&za, SCRIPT_NAME); if (script_entry == NULL) { |