Bug#741510: android-tools-fsutils: make_ext4fs compiled without -DANDROID lacks important functionality

[Leon Winter]

Source: android-tools-fsutils
Version: 4.2.2+git20130529
Severity: important
Tags: patch



-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (550, 'testing'), (500, 'stable'), (210, 'unstable'), (1, 
'experimental')
Architecture: i386 (x86_64)

Kernel: Linux 3.11.10-64+ (SMP w/32 CPU cores; PREEMPT)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

diff --git a/debian/makefiles/ext4_utils.mk b/debian/makefiles/ext4_utils.mk
index 50db0cc..48386e7 100644
--- a/debian/makefiles/ext4_utils.mk
+++ b/debian/makefiles/ext4_utils.mk
@@ -38,6 +38,7 @@ CPPFLAGS+= -I$(SRCDIR)/extras/ext4_utils
 CPPFLAGS+= -I/usr/include
 CPPFLAGS+= -I$(SRCDIR)/core/include
 CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include
+CPPFLAGS+= -DANDROID
 
 LIBS+= -lz -lselinux
 
diff --git a/extras/ext4_utils/make_ext4fs_main.c b/extras/ext4_utils/make_ext4fs_main.c
index 6688237..4744087 100644
--- a/extras/ext4_utils/make_ext4fs_main.c
+++ b/extras/ext4_utils/make_ext4fs_main.c
@@ -148,7 +148,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-#if !defined(HOST)
+#if false && !defined(HOST)
 	// Use only if -S option not requested
 	if (!sehnd && mountpoint) {
 		sehnd = selinux_android_file_context_handle();