PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the header path for ext4_utils."

Browse Source 
am: 2bd94433f8

Change-Id: I6a8dbfcecbabbba26acc81ca0c704b9a7f3c63db
This commit is contained in:
Tao Bao
2016-10-10 21:14:34 +00:00
committed by android-build-merger
parent 7bf11aadfd 2bd94433f8
commit 00a9050815
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@@ -71,7 +71,6 @@ LOCAL_CLANG := true
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
system/vold \ system/vold \
system/extras/ext4_utils \
system/core/adb \ system/core/adb \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
@@ -98,9 +97,6 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_HAL_STATIC_LIBRARIES := libhealthd LOCAL_HAL_STATIC_LIBRARIES := libhealthd
LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)
LOCAL_CFLAGS += -DAB_OTA_UPDATER=1 LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
endif endif

6
roots.cpp
View File

@@ -27,12 +27,12 @@
#include <fcntl.h> #include <fcntl.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <ext4_utils/make_ext4fs.h>
#include <ext4_utils/wipe.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include "common.h" #include "common.h"
#include "make_ext4fs.h"
#include "mounts.h" #include "mounts.h"
#include "wipe.h"
#include "cryptfs.h" #include "cryptfs.h"
static struct fstab *fstab = NULL; static struct fstab *fstab = NULL;

1
updater/Android.mk
View File

@@ -62,7 +62,6 @@ LOCAL_STATIC_LIBRARIES += \
$(tune2fs_static_libraries) $(tune2fs_static_libraries)
LOCAL_CFLAGS += -Wno-unused-parameter -Werror LOCAL_CFLAGS += -Wno-unused-parameter -Werror
LOCAL_C_INCLUDES += system/extras/ext4_utils
LOCAL_STATIC_LIBRARIES += \ LOCAL_STATIC_LIBRARIES += \
libsparse_static \ libsparse_static \
libz libz

5
updater/install.cpp
View File

@@ -40,6 +40,8 @@
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <ext4_utils/make_ext4fs.h>
#include <ext4_utils/wipe.h>
#include <selinux/label.h> #include <selinux/label.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>
@@ -57,9 +59,6 @@
#include "install.h" #include "install.h"
#include "tune2fs.h" #include "tune2fs.h"
#include "make_ext4fs.h"
#include "wipe.h"
// Send over the buffer to recovery though the command pipe. // Send over the buffer to recovery though the command pipe.
static void uiPrint(State* state, const std::string& buffer) { static void uiPrint(State* state, const std::string& buffer) {
UpdaterInfo* ui = reinterpret_cast<UpdaterInfo*>(state->cookie); UpdaterInfo* ui = reinterpret_cast<UpdaterInfo*>(state->cookie);