Update the header path for ext4_utils.

Test: mmma system/vold

Change-Id: I805b8874b05b8043390c2cd3c143cc469913c067
This commit is contained in:
Tao Bao 2016-10-05 18:01:19 -07:00
parent 7ac97f8e37
commit 989fec2769
3 changed files with 4 additions and 5 deletions

View file

@ -33,7 +33,6 @@ common_src_files := \
secontext.cpp \ secontext.cpp \
common_c_includes := \ common_c_includes := \
system/extras/ext4_utils \
system/extras/f2fs_utils \ system/extras/f2fs_utils \
external/scrypt/lib/crypto \ external/scrypt/lib/crypto \
frameworks/native/include \ frameworks/native/include \

View file

@ -40,13 +40,13 @@
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#include "cryptfs.h" #include "cryptfs.h"
#include "ext4_crypt.h"
#include "key_control.h"
#define EMULATED_USES_SELINUX 0 #define EMULATED_USES_SELINUX 0
#define MANAGE_MISC_DIRS 0 #define MANAGE_MISC_DIRS 0
#include <cutils/fs.h> #include <cutils/fs.h>
#include <ext4_utils/ext4_crypt.h>
#include <ext4_utils/key_control.h>
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -38,7 +38,8 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <errno.h> #include <errno.h>
#include <ext4.h> #include <ext4_utils/ext4.h>
#include <ext4_utils/ext4_utils.h>
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include <time.h> #include <time.h>
@ -57,7 +58,6 @@
#include "VoldUtil.h" #include "VoldUtil.h"
#include "crypto_scrypt.h" #include "crypto_scrypt.h"
#include "Ext4Crypt.h" #include "Ext4Crypt.h"
#include "ext4_utils.h"
#include "f2fs_sparseblock.h" #include "f2fs_sparseblock.h"
#include "CheckBattery.h" #include "CheckBattery.h"
#include "Process.h" #include "Process.h"