Update the header path for ext4_utils.
Test: mmma system/vold
Change-Id: I805b8874b05b8043390c2cd3c143cc469913c067
(cherry picked from commit 989fec27690758ad1e6c521713f1a88c50c9c857)
diff --git a/Android.mk b/Android.mk
index 1c85809..2f97536 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,7 +33,6 @@
secontext.cpp \
common_c_includes := \
- system/extras/ext4_utils \
system/extras/f2fs_utils \
external/scrypt/lib/crypto \
frameworks/native/include \
diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index cb41295..4e768b3 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -40,13 +40,13 @@
#include <private/android_filesystem_config.h>
#include "cryptfs.h"
-#include "ext4_crypt.h"
-#include "key_control.h"
#define EMULATED_USES_SELINUX 0
#define MANAGE_MISC_DIRS 0
#include <cutils/fs.h>
+#include <ext4_utils/ext4_crypt.h>
+#include <ext4_utils/key_control.h>
#include <android-base/file.h>
#include <android-base/logging.h>
diff --git a/cryptfs.c b/cryptfs.c
index 6dd56cb..e432206 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -38,7 +38,8 @@
#include <openssl/evp.h>
#include <openssl/sha.h>
#include <errno.h>
-#include <ext4.h>
+#include <ext4_utils/ext4.h>
+#include <ext4_utils/ext4_utils.h>
#include <linux/kdev_t.h>
#include <fs_mgr.h>
#include <time.h>
@@ -57,7 +58,6 @@
#include "VoldUtil.h"
#include "crypto_scrypt.h"
#include "Ext4Crypt.h"
-#include "ext4_utils.h"
#include "f2fs_sparseblock.h"
#include "CheckBattery.h"
#include "Process.h"