Merge "Update the header path for ext4_utils." am: 2bd94433f8

am: 00a9050815

Change-Id: Id897069e1ea0ad04ee7f1096c9ae36fb2b9d7974

Android.mk

@@ -71,7 +71,6 @@ LOCAL_CLANG := true
 
 LOCAL_C_INCLUDES += \
     system/vold \
-    system/extras/ext4_utils \
     system/core/adb \
 
 LOCAL_STATIC_LIBRARIES := \
@@ -98,9 +97,6 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_HAL_STATIC_LIBRARIES := libhealthd
 
-LOCAL_C_INCLUDES += system/extras/ext4_utils
-LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
-
 ifeq ($(AB_OTA_UPDATER),true)
     LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
 endif

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;

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

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);