summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-11 19:26:31 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-10-11 19:26:31 +0200
commite3bd8e783080002d04a139eba66f69c7091798bc (patch)
tree30a31c8a4fc05fb22ba0de4d4361ea8ff17fb516 /updater
parentMerge "otautil: Fix mac build." am: eb8a064066 am: bc131ef1bd am: 814f05d853 (diff)
parentMerge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2 am: 28f6938862 (diff)
downloadandroid_bootable_recovery-e3bd8e783080002d04a139eba66f69c7091798bc.tar
android_bootable_recovery-e3bd8e783080002d04a139eba66f69c7091798bc.tar.gz
android_bootable_recovery-e3bd8e783080002d04a139eba66f69c7091798bc.tar.bz2
android_bootable_recovery-e3bd8e783080002d04a139eba66f69c7091798bc.tar.lz
android_bootable_recovery-e3bd8e783080002d04a139eba66f69c7091798bc.tar.xz
android_bootable_recovery-e3bd8e783080002d04a139eba66f69c7091798bc.tar.zst
android_bootable_recovery-e3bd8e783080002d04a139eba66f69c7091798bc.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/blockimg.cpp4
-rw-r--r--updater/install.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 0f8364441..ce3cea4f3 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -52,8 +52,8 @@
#include "edify/expr.h"
#include "otafault/ota_io.h"
#include "otautil/error_code.h"
-#include "print_sha1.h"
-#include "rangeset.h"
+#include "otautil/print_sha1.h"
+#include "otautil/rangeset.h"
#include "updater/install.h"
#include "updater/updater.h"
diff --git a/updater/install.cpp b/updater/install.cpp
index 01210f51c..9425d1872 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -54,6 +54,7 @@
#include <openssl/sha.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
+#include <tune2fs.h>
#include <ziparchive/zip_archive.h>
#include "edify/expr.h"
@@ -61,8 +62,7 @@
#include "otafault/ota_io.h"
#include "otautil/DirUtil.h"
#include "otautil/error_code.h"
-#include "print_sha1.h"
-#include "tune2fs.h"
+#include "otautil/print_sha1.h"
#include "updater/updater.h"
// Send over the buffer to recovery though the command pipe.