summaryrefslogtreecommitdiffstats
path: root/roots.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-10-06 08:17:01 +0200
committerTao Bao <tbao@google.com>2016-10-07 23:33:34 +0200
commitdf0d2a2ae03b4f6184d6757f270fb41917a4f594 (patch)
treeab7173fbff4fdffc0beb4d4a3b858b083a62aa6c /roots.cpp
parentresolve merge conflicts of 713ad36 to master (diff)
downloadandroid_bootable_recovery-df0d2a2ae03b4f6184d6757f270fb41917a4f594.tar
android_bootable_recovery-df0d2a2ae03b4f6184d6757f270fb41917a4f594.tar.gz
android_bootable_recovery-df0d2a2ae03b4f6184d6757f270fb41917a4f594.tar.bz2
android_bootable_recovery-df0d2a2ae03b4f6184d6757f270fb41917a4f594.tar.lz
android_bootable_recovery-df0d2a2ae03b4f6184d6757f270fb41917a4f594.tar.xz
android_bootable_recovery-df0d2a2ae03b4f6184d6757f270fb41917a4f594.tar.zst
android_bootable_recovery-df0d2a2ae03b4f6184d6757f270fb41917a4f594.zip
Diffstat (limited to '')
-rw-r--r--roots.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/roots.cpp b/roots.cpp
index fe49f2b86..14018fcdc 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -27,12 +27,12 @@
#include <fcntl.h>
#include <android-base/logging.h>
-
+#include <ext4_utils/make_ext4fs.h>
+#include <ext4_utils/wipe.h>
#include <fs_mgr.h>
+
#include "common.h"
-#include "make_ext4fs.h"
#include "mounts.h"
-#include "wipe.h"
#include "cryptfs.h"
static struct fstab *fstab = NULL;