summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorJed Estep <jestep@google.com>2015-12-16 01:04:53 +0100
committerTao Bao <tbao@google.com>2016-02-20 00:32:12 +0100
commitd940887dde23597dc358b16d96ca48dd7480fee6 (patch)
tree1292398c612cdc05937afeaf56b63a7cd2f4eaba /updater
parentMerge "minadbd: update for adb_thread_create signature change." (diff)
downloadandroid_bootable_recovery-d940887dde23597dc358b16d96ca48dd7480fee6.tar
android_bootable_recovery-d940887dde23597dc358b16d96ca48dd7480fee6.tar.gz
android_bootable_recovery-d940887dde23597dc358b16d96ca48dd7480fee6.tar.bz2
android_bootable_recovery-d940887dde23597dc358b16d96ca48dd7480fee6.tar.lz
android_bootable_recovery-d940887dde23597dc358b16d96ca48dd7480fee6.tar.xz
android_bootable_recovery-d940887dde23597dc358b16d96ca48dd7480fee6.tar.zst
android_bootable_recovery-d940887dde23597dc358b16d96ca48dd7480fee6.zip
Diffstat (limited to '')
-rw-r--r--updater/blockimg.cpp2
-rw-r--r--updater/install.cpp2
-rw-r--r--updater/updater.cpp2
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 0f22e6d04..efb4a8cec 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
@@ -82,6 +83,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) {