From a601fab9c6d5c1e029f47dbf11d888da91562cd2 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Mon, 19 Oct 2015 02:49:25 +0300
Subject: Remove ext4 guards

* Fix compilation on yaffs targets

Change-Id: Icd571dce3ee8c232b13ae199df6e0a4feeb7fb68
---
 updater/Android.mk | 3 ---
 updater/install.c  | 5 -----
 2 files changed, 8 deletions(-)

(limited to 'updater')

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);
-- 
cgit v1.1