Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 148b85b0 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Update the header path for ext4_utils." 

am: 5bc3ce85

Change-Id: I962e2c4b311ea93c12de8be26b7a228fae1b1b22
parents f620b87e 5bc3ce85

fastboot/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -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 := \

fastboot/fs.cpp

+1 −1
Original line number Diff line number Diff line 
#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)

fs_mgr/fs_mgr.c

+5 −7
Original line number Diff line number Diff line
@@ -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"

fs_mgr/fs_mgr_format.c

+3 −3
Original line number Diff line number Diff line
@@ -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"

init/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -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