diff options
| author | Tao Bao <tbao@google.com> | 2016-03-17 23:57:55 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-17 23:57:55 +0100 |
| commit | 156de0473efb2150f72743d925dc61a3e6fb9214 (patch) | |
| tree | 4529429bcadb33c5abee36f31aed6bee9bbad7ff /updater | |
| parent | resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp (diff) | |
| parent | resolve merge conflicts of ce58688 to nyc-dev-plus-aosp (diff) | |
| download | android_bootable_recovery-156de0473efb2150f72743d925dc61a3e6fb9214.tar android_bootable_recovery-156de0473efb2150f72743d925dc61a3e6fb9214.tar.gz android_bootable_recovery-156de0473efb2150f72743d925dc61a3e6fb9214.tar.bz2 android_bootable_recovery-156de0473efb2150f72743d925dc61a3e6fb9214.tar.lz android_bootable_recovery-156de0473efb2150f72743d925dc61a3e6fb9214.tar.xz android_bootable_recovery-156de0473efb2150f72743d925dc61a3e6fb9214.tar.zst android_bootable_recovery-156de0473efb2150f72743d925dc61a3e6fb9214.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, 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 d2a7ac97a..f82097d7b 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -27,7 +27,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 @@ -87,7 +86,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) { |