Merge "Update the header path for ext4_utils." am: 5bc3ce85cf
am: 148b85b050
am: 2815ac5584
Change-Id: I966296de6eb4ff7518b9cfcd5853fe919765b826
This commit is contained in:
commit
6efc7a787b
|
@ -21,7 +21,6 @@ include $(CLEAR_VARS)
|
|||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/../adb \
|
||||
$(LOCAL_PATH)/../mkbootimg \
|
||||
$(LOCAL_PATH)/../../extras/ext4_utils \
|
||||
$(LOCAL_PATH)/../../extras/f2fs_utils \
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#include "fs.h"
|
||||
|
||||
#include "fastboot.h"
|
||||
#include "make_ext4fs.h"
|
||||
#include "make_f2fs.h"
|
||||
|
||||
#include <errno.h>
|
||||
|
@ -12,6 +11,7 @@
|
|||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <ext4_utils/make_ext4fs.h>
|
||||
#include <sparse/sparse.h>
|
||||
|
||||
static int generate_ext4_image(int fd, long long partSize, const std::string& initial_dir)
|
||||
|
|
|
@ -30,20 +30,18 @@
|
|||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <ext4.h>
|
||||
#include <ext4_crypt_init_extensions.h>
|
||||
#include <ext4_sb.h>
|
||||
|
||||
#include <cutils/android_reboot.h>
|
||||
#include <cutils/partition_utils.h>
|
||||
#include <cutils/properties.h>
|
||||
#include <ext4_utils/ext4.h>
|
||||
#include <ext4_utils/ext4_crypt_init_extensions.h>
|
||||
#include <ext4_utils/ext4_sb.h>
|
||||
#include <ext4_utils/ext4_utils.h>
|
||||
#include <ext4_utils/wipe.h>
|
||||
#include <linux/loop.h>
|
||||
#include <logwrap/logwrap.h>
|
||||
#include <private/android_filesystem_config.h>
|
||||
|
||||
#include "ext4_utils.h"
|
||||
#include "wipe.h"
|
||||
|
||||
#include "fs_mgr_priv.h"
|
||||
#include "fs_mgr_priv_verity.h"
|
||||
|
||||
|
|
|
@ -24,13 +24,13 @@
|
|||
#include <cutils/partition_utils.h>
|
||||
#include <sys/mount.h>
|
||||
|
||||
#include <ext4_utils/ext4_utils.h>
|
||||
#include <ext4_utils/ext4.h>
|
||||
#include <ext4_utils/make_ext4fs.h>
|
||||
#include <selinux/selinux.h>
|
||||
#include <selinux/label.h>
|
||||
#include <selinux/android.h>
|
||||
|
||||
#include "ext4_utils.h"
|
||||
#include "ext4.h"
|
||||
#include "make_ext4fs.h"
|
||||
#include "fs_mgr_priv.h"
|
||||
#include "cryptfs.h"
|
||||
|
||||
|
|
|
@ -74,7 +74,6 @@ LOCAL_SRC_FILES:= \
|
|||
|
||||
LOCAL_MODULE:= init
|
||||
LOCAL_C_INCLUDES += \
|
||||
system/extras/ext4_utils \
|
||||
system/core/mkbootimg
|
||||
|
||||
LOCAL_FORCE_STATIC_EXECUTABLE := true
|
||||
|
|
|
@ -37,8 +37,6 @@
|
|||
#include <unistd.h>
|
||||
#include <linux/loop.h>
|
||||
#include <linux/module.h>
|
||||
#include <ext4_crypt.h>
|
||||
#include <ext4_crypt_init_extensions.h>
|
||||
|
||||
#include <selinux/selinux.h>
|
||||
#include <selinux/label.h>
|
||||
|
@ -51,6 +49,8 @@
|
|||
#include <bootloader_message/bootloader_message.h>
|
||||
#include <cutils/partition_utils.h>
|
||||
#include <cutils/android_reboot.h>
|
||||
#include <ext4_utils/ext4_crypt.h>
|
||||
#include <ext4_utils/ext4_crypt_init_extensions.h>
|
||||
#include <logwrap/logwrap.h>
|
||||
|
||||
#include "action.h"
|
||||
|
|
Loading…
Reference in New Issue