summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorJed Estep <jestep@google.com>2016-02-23 02:37:09 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-23 02:37:09 +0100
commit30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4 (patch)
treeb12a0e6ddf26cefc7c46948d23bc4489fd79a892 /updater
parentMerge "recovery: check battery level before installing package." am: 16d0a18514 am: d1b66ad6a1 (diff)
parentControl fault injection with config files instead of build flags (diff)
downloadandroid_bootable_recovery-30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4.tar
android_bootable_recovery-30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4.tar.gz
android_bootable_recovery-30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4.tar.bz2
android_bootable_recovery-30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4.tar.lz
android_bootable_recovery-30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4.tar.xz
android_bootable_recovery-30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4.tar.zst
android_bootable_recovery-30ed5b99f55b759b2aa0f95cfd457ea0ffbd8bf4.zip
Diffstat (limited to 'updater')
-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 80e75037c..0d58f6486 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -27,6 +27,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) {