summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-03-17 23:44:33 +0100
committerTao Bao <tbao@google.com>2016-03-17 23:46:10 +0100
commit6f446373fdda9e084e7cce86c4694f365e75951b (patch)
tree23ccffeb52a3ec9791af0658360806c01495b2ca /updater
parentresolve merge conflicts of f73abf3 to nyc-dev-plus-aosp (diff)
parentRevert "DO NOT MERGE Control fault injection with config files instead of build flags" (diff)
downloadandroid_bootable_recovery-6f446373fdda9e084e7cce86c4694f365e75951b.tar
android_bootable_recovery-6f446373fdda9e084e7cce86c4694f365e75951b.tar.gz
android_bootable_recovery-6f446373fdda9e084e7cce86c4694f365e75951b.tar.bz2
android_bootable_recovery-6f446373fdda9e084e7cce86c4694f365e75951b.tar.lz
android_bootable_recovery-6f446373fdda9e084e7cce86c4694f365e75951b.tar.xz
android_bootable_recovery-6f446373fdda9e084e7cce86c4694f365e75951b.tar.zst
android_bootable_recovery-6f446373fdda9e084e7cce86c4694f365e75951b.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, 2 insertions, 4 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 56378d4f5..44de4e031 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 "ota_io.h"
+#include "otafault/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 bc4cca913..413e147a1 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 "ota_io.h"
+#include "otafault/ota_io.h"
#include "updater.h"
#include "install.h"
#include "tune2fs.h"
diff --git a/updater/updater.cpp b/updater/updater.cpp
index 1693fa1db..ddc01e125 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -25,7 +25,6 @@
#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
@@ -85,7 +84,6 @@ 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) {