diff options
| author | Tao Bao <tbao@google.com> | 2016-10-11 00:14:43 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-11 00:14:43 +0200 |
| commit | c26e3770f6c07224698fe7737eeff31148fa8ecd (patch) | |
| tree | e1c94e92b1bab7520a9ce6936c063db3e7f278a2 | |
| parent | Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd (diff) | |
| parent | Merge "Update the header path for ext4_utils." am: 2bd94433f8 (diff) | |
| download | android_bootable_recovery-c26e3770f6c07224698fe7737eeff31148fa8ecd.tar android_bootable_recovery-c26e3770f6c07224698fe7737eeff31148fa8ecd.tar.gz android_bootable_recovery-c26e3770f6c07224698fe7737eeff31148fa8ecd.tar.bz2 android_bootable_recovery-c26e3770f6c07224698fe7737eeff31148fa8ecd.tar.lz android_bootable_recovery-c26e3770f6c07224698fe7737eeff31148fa8ecd.tar.xz android_bootable_recovery-c26e3770f6c07224698fe7737eeff31148fa8ecd.tar.zst android_bootable_recovery-c26e3770f6c07224698fe7737eeff31148fa8ecd.zip | |
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | roots.cpp | 6 | ||||
| -rw-r--r-- | updater/Android.mk | 1 | ||||
| -rw-r--r-- | updater/install.cpp | 5 |
4 files changed, 5 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index 185562307..363f2df10 100644 --- a/Android.mk +++ b/Android.mk @@ -70,7 +70,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 @@ -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; diff --git a/updater/Android.mk b/updater/Android.mk index 507088dcd..d9fc72c8f 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -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 diff --git a/updater/install.cpp b/updater/install.cpp index 8c33c2bf3..24e35cfb8 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -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); |