From b1e4100011d2d81eb1da97a50d99d8b261d61c0c Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 17 Mar 2016 22:29:23 +0000 Subject: Revert "DO NOT MERGE Control fault injection with config files instead of build flags" This reverts commit f73abf36bcfd433a3fdd1664a77e8e531346c1b1. Bug: 27724259 Change-Id: I1301fdad15650837d0b1febd0c3239134e2b94fb --- updater/blockimg.cpp | 2 +- updater/install.cpp | 2 +- updater/updater.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'updater') diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index faa7008c5..e9c8ddbc0 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 6ae1e5fbf..b7d9e85a2 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) { -- cgit v1.2.3