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

Commit de40ba59 authored by Tao Bao's avatar Tao Bao
Browse files

Update the header path for ext4_utils. 

Test: `mmma bootable/recovery`
Change-Id: I70ccddb3ddf46bb012fdc5f632afc46ebdd5473e
parent aa4924ca

Android.mk

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

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

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

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