summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-10-10 22:07:32 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-10-10 22:07:32 +0200
commit2bd94433f8eddb6f35be5e899d4a885b8e1a3717 (patch)
tree9a3904480d6a9bc172cbd6fbc834574d33db9786 /updater
parentMerge "No longer need android/log.h" (diff)
parentUpdate the header path for ext4_utils. (diff)
downloadandroid_bootable_recovery-2bd94433f8eddb6f35be5e899d4a885b8e1a3717.tar
android_bootable_recovery-2bd94433f8eddb6f35be5e899d4a885b8e1a3717.tar.gz
android_bootable_recovery-2bd94433f8eddb6f35be5e899d4a885b8e1a3717.tar.bz2
android_bootable_recovery-2bd94433f8eddb6f35be5e899d4a885b8e1a3717.tar.lz
android_bootable_recovery-2bd94433f8eddb6f35be5e899d4a885b8e1a3717.tar.xz
android_bootable_recovery-2bd94433f8eddb6f35be5e899d4a885b8e1a3717.tar.zst
android_bootable_recovery-2bd94433f8eddb6f35be5e899d4a885b8e1a3717.zip
Diffstat (limited to '')
-rw-r--r--updater/Android.mk1
-rw-r--r--updater/install.cpp5
2 files changed, 2 insertions, 4 deletions
diff --git a/updater/Android.mk b/updater/Android.mk
index 507088dcd..d9fc72c8f 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -62,7 +62,6 @@ LOCAL_STATIC_LIBRARIES += \
$(tune2fs_static_libraries)
LOCAL_CFLAGS += -Wno-unused-parameter -Werror
-LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_STATIC_LIBRARIES += \
libsparse_static \
libz
diff --git a/updater/install.cpp b/updater/install.cpp
index 8c33c2bf3..24e35cfb8 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -40,6 +40,8 @@
#include <android-base/properties.h>
#include <android-base/strings.h>
#include <android-base/stringprintf.h>
+#include <ext4_utils/make_ext4fs.h>
+#include <ext4_utils/wipe.h>
#include <selinux/label.h>
#include <selinux/selinux.h>
@@ -57,9 +59,6 @@
#include "install.h"
#include "tune2fs.h"
-#include "make_ext4fs.h"
-#include "wipe.h"
-
// Send over the buffer to recovery though the command pipe.
static void uiPrint(State* state, const std::string& buffer) {
UpdaterInfo* ui = reinterpret_cast<UpdaterInfo*>(state->cookie);