summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-10 18:31:44 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-10-10 18:31:44 +0200
commit43e4eddd664dbc39e181a99f457394196d6c3f08 (patch)
treef340f4bf4ab21aae676a042591d6786d221d683a /updater
parentMerge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201 (diff)
parentMerge changes from topic "libedify-header" am: abade5af15 (diff)
downloadandroid_bootable_recovery-43e4eddd664dbc39e181a99f457394196d6c3f08.tar
android_bootable_recovery-43e4eddd664dbc39e181a99f457394196d6c3f08.tar.gz
android_bootable_recovery-43e4eddd664dbc39e181a99f457394196d6c3f08.tar.bz2
android_bootable_recovery-43e4eddd664dbc39e181a99f457394196d6c3f08.tar.lz
android_bootable_recovery-43e4eddd664dbc39e181a99f457394196d6c3f08.tar.xz
android_bootable_recovery-43e4eddd664dbc39e181a99f457394196d6c3f08.tar.zst
android_bootable_recovery-43e4eddd664dbc39e181a99f457394196d6c3f08.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, 3 insertions, 3 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 696cddf41..0f8364441 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -50,8 +50,8 @@
#include <ziparchive/zip_archive.h>
#include "edify/expr.h"
-#include "error_code.h"
#include "otafault/ota_io.h"
+#include "otautil/error_code.h"
#include "print_sha1.h"
#include "rangeset.h"
#include "updater/install.h"
diff --git a/updater/install.cpp b/updater/install.cpp
index fc085d5aa..01210f51c 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -57,10 +57,10 @@
#include <ziparchive/zip_archive.h>
#include "edify/expr.h"
-#include "error_code.h"
#include "mounts.h"
#include "otafault/ota_io.h"
#include "otautil/DirUtil.h"
+#include "otautil/error_code.h"
#include "print_sha1.h"
#include "tune2fs.h"
#include "updater/updater.h"
diff --git a/updater/updater.cpp b/updater/updater.cpp
index 309c309a5..f55a0d3bd 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -31,10 +31,10 @@
#include <ziparchive/zip_archive.h>
#include "edify/expr.h"
-#include "error_code.h"
#include "otafault/config.h"
#include "otautil/DirUtil.h"
#include "otautil/SysUtil.h"
+#include "otautil/error_code.h"
#include "updater/blockimg.h"
#include "updater/install.h"