diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-10-19 02:49:25 +0300 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2015-11-07 01:14:28 -0800 |
| commit | a601fab9c6d5c1e029f47dbf11d888da91562cd2 (patch) | |
| tree | bfe07ec980b86a83cf4aacbf64dca351b10383e4 /updater | |
| parent | 5cb4bd06af989391a4523e74ea44b6b6a0302d96 (diff) | |
| download | bootable_recovery-a601fab9c6d5c1e029f47dbf11d888da91562cd2.zip bootable_recovery-a601fab9c6d5c1e029f47dbf11d888da91562cd2.tar.gz bootable_recovery-a601fab9c6d5c1e029f47dbf11d888da91562cd2.tar.bz2 | |
Remove ext4 guards
* Fix compilation on yaffs targets
Change-Id: Icd571dce3ee8c232b13ae199df6e0a4feeb7fb68
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/Android.mk | 3 | ||||
| -rw-r--r-- | updater/install.c | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/updater/Android.mk b/updater/Android.mk index f4ed954..c24bca8 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -19,15 +19,12 @@ LOCAL_MODULE_TAGS := eng LOCAL_SRC_FILES := $(updater_src_files) -ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) -LOCAL_CFLAGS += -DUSE_EXT4 LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_C_INCLUDES += system/extras/ext4_utils LOCAL_STATIC_LIBRARIES += \ libext4_utils_static \ libsparse_static \ libz -endif LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS) LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz diff --git a/updater/install.c b/updater/install.c index ba2dda7..c6d0e1c 100644 --- a/updater/install.c +++ b/updater/install.c @@ -47,11 +47,8 @@ #include "updater.h" #include "install.h" #include "tune2fs.h" - -#ifdef USE_EXT4 #include "make_ext4fs.h" #include "wipe.h" -#endif void uiPrint(State* state, char* buffer) { char* line = strtok(buffer, "\n"); @@ -332,7 +329,6 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) { goto done; } result = location; -#ifdef USE_EXT4 } else if (strcmp(fs_type, "ext4") == 0) { int status = make_ext4fs(location, atoll(fs_size), mount_point, sehandle); if (status != 0) { @@ -360,7 +356,6 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) { goto done; } result = location; -#endif } else { printf("%s: unsupported fs_type \"%s\" partition_type \"%s\"", name, fs_type, partition_type); |