Fix build for darwin host.

Change-Id: I7c73c5c99b25e66ead23e3201790bb9735f36ce5

4 files changed, 44 insertions, 20 deletions

diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk
index 168f8f83..87af46a5 100644
--- a/lib/blkid/Android.mk
+++ b/lib/blkid/Android.mk
@@ -28,7 +28,6 @@ libext2_blkid_cflags := -O2 -g -W -Wall \
 	-DHAVE_SYS_IOCTL_H \
 	-DHAVE_SYS_MMAN_H \
 	-DHAVE_SYS_MOUNT_H \
-	-DHAVE_SYS_PRCTL_H \
 	-DHAVE_SYS_RESOURCE_H \
 	-DHAVE_SYS_SELECT_H \
 	-DHAVE_SYS_STAT_H \
@@ -38,21 +37,24 @@ libext2_blkid_cflags := -O2 -g -W -Wall \
 	-DHAVE_MMAP \
 	-DHAVE_UTIME_H \
 	-DHAVE_GETPAGESIZE \
-	-DHAVE_LSEEK64 \
-	-DHAVE_LSEEK64_PROTOTYPE \
 	-DHAVE_EXT2_IOCTLS \
-	-DHAVE_LINUX_FD_H \
 	-DHAVE_TYPE_SSIZE_T \
 	-DHAVE_SYS_TIME_H \
 	-DHAVE_SYSCONF
 
+libext2_blkid_cflags_linux := \
+	-DHAVE_LINUX_FD_H \
+	-DHAVE_SYS_PRCTL_H \
+	-DHAVE_LSEEK64 \
+	-DHAVE_LSEEK64_PROTOTYPE
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_blkid_src_files)
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_blkid_system_shared_libraries)
 LOCAL_SHARED_LIBRARIES := $(libext2_blkid_shared_libraries)
 LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
-LOCAL_CFLAGS := $(libext2_blkid_cflags)
+LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_blkid
 LOCAL_MODULE_TAGS:= $(use_e2fsprog_module_tags)
@@ -64,7 +66,11 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(libext2_blkid_src_files)
 LOCAL_SHARED_LIBRARIES := $(libext2_blkid_shared_libraries)
 LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
+ifeq ($(HOST_OS),linux)
+LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
+else
 LOCAL_CFLAGS := $(libext2_blkid_cflags)
+endif
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_blkid_host
 LOCAL_MODULE_STEM := libext2_blkid
diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index 38799eb6..a7da0e79 100644
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -16,7 +16,6 @@ libext2_com_err_cflags := -O2 -g -W -Wall \
 	-DHAVE_SYS_IOCTL_H \
 	-DHAVE_SYS_MMAN_H \
 	-DHAVE_SYS_MOUNT_H \
-	-DHAVE_SYS_PRCTL_H \
 	-DHAVE_SYS_RESOURCE_H \
 	-DHAVE_SYS_SELECT_H \
 	-DHAVE_SYS_STAT_H \
@@ -26,21 +25,24 @@ libext2_com_err_cflags := -O2 -g -W -Wall \
 	-DHAVE_MMAP \
 	-DHAVE_UTIME_H \
 	-DHAVE_GETPAGESIZE \
-	-DHAVE_LSEEK64 \
-	-DHAVE_LSEEK64_PROTOTYPE \
 	-DHAVE_EXT2_IOCTLS \
-	-DHAVE_LINUX_FD_H \
 	-DHAVE_TYPE_SSIZE_T \
 	-DHAVE_SYS_TIME_H \
 	-DHAVE_SYSCONF
 
+libext2_com_err_cflags_linux := \
+	-DHAVE_LINUX_FD_H \
+	-DHAVE_SYS_PRCTL_H \
+	-DHAVE_LSEEK64 \
+	-DHAVE_LSEEK64_PROTOTYPE
+
 libext2_com_err_system_shared_libraries := libc
 
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_com_err_src_files)
 LOCAL_C_INCLUDES := $(libext2_com_err_c_includes)
-LOCAL_CFLAGS := $(libext2_com_err_cflags)
+LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 LOCAL_MODULE := libext2_com_err
 LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
@@ -52,7 +54,11 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_com_err_src_files)
 LOCAL_C_INCLUDES := $(libext2_com_err_c_includes)
+ifeq ($(HOST_OS),linux)
+LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
+else
 LOCAL_CFLAGS := $(libext2_com_err_cflags)
+endif
 LOCAL_MODULE := libext2_com_err_host
 LOCAL_MODULE_STEM := libext2_com_err
 LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index ca0ee37c..2de0ac60 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -80,7 +80,6 @@ libext2fs_cflags := -O2 -g -W -Wall \
 	-DHAVE_SYS_IOCTL_H \
 	-DHAVE_SYS_MMAN_H \
 	-DHAVE_SYS_MOUNT_H \
-	-DHAVE_SYS_PRCTL_H \
 	-DHAVE_SYS_RESOURCE_H \
 	-DHAVE_SYS_SELECT_H \
 	-DHAVE_SYS_STAT_H \
@@ -90,21 +89,24 @@ libext2fs_cflags := -O2 -g -W -Wall \
 	-DHAVE_MMAP \
 	-DHAVE_UTIME_H \
 	-DHAVE_GETPAGESIZE \
-	-DHAVE_LSEEK64 \
-	-DHAVE_LSEEK64_PROTOTYPE \
 	-DHAVE_EXT2_IOCTLS \
-	-DHAVE_LINUX_FD_H \
 	-DHAVE_TYPE_SSIZE_T \
 	-DHAVE_SYS_TIME_H \
 	-DHAVE_SYSCONF
 
+libext2fs_cflags_linux := \
+	-DHAVE_LINUX_FD_H \
+	-DHAVE_SYS_PRCTL_H \
+	-DHAVE_LSEEK64 \
+	-DHAVE_LSEEK64_PROTOTYPE
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2fs_src_files)
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2fs_system_shared_libraries)
 LOCAL_SHARED_LIBRARIES := $(libext2fs_shared_libraries)
 LOCAL_C_INCLUDES := $(libext2fs_c_includes)
-LOCAL_CFLAGS := $(libext2fs_cflags)
+LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2fs
 LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
@@ -116,7 +118,11 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(libext2fs_src_files)
 LOCAL_SHARED_LIBRARIES := $(libext2fs_shared_libraries)
 LOCAL_C_INCLUDES := $(libext2fs_c_includes)
+ifeq ($(HOST_OS),linux)
+LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
+else
 LOCAL_CFLAGS := $(libext2fs_cflags)
+endif
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2fs_host
 LOCAL_MODULE_STEM := libext2fs
diff --git a/misc/Android.mk b/misc/Android.mk
index 0c4d8142..743f6bbf 100644
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -18,7 +18,6 @@ mke2fs_cflags := -O2 -g -W -Wall \
 	-DHAVE_SYS_IOCTL_H \
 	-DHAVE_SYS_MMAN_H \
 	-DHAVE_SYS_MOUNT_H \
-	-DHAVE_SYS_PRCTL_H \
 	-DHAVE_SYS_RESOURCE_H \
 	-DHAVE_SYS_SELECT_H \
 	-DHAVE_SYS_STAT_H \
@@ -29,15 +28,18 @@ mke2fs_cflags := -O2 -g -W -Wall \
 	-DHAVE_MMAP \
 	-DHAVE_UTIME_H \
 	-DHAVE_GETPAGESIZE \
-	-DHAVE_LSEEK64 \
-	-DHAVE_LSEEK64_PROTOTYPE \
 	-DHAVE_EXT2_IOCTLS \
-	-DHAVE_LINUX_FD_H \
 	-DHAVE_TYPE_SSIZE_T \
 	-DHAVE_GETOPT_H \
 	-DHAVE_SYS_TIME_H \
 	-DHAVE_SYSCONF
 
+mke2fs_cflags_linux := \
+	-DHAVE_LINUX_FD_H \
+	-DHAVE_SYS_PRCTL_H \
+	-DHAVE_LSEEK64 \
+	-DHAVE_LSEEK64_PROTOTYPE
+
 mke2fs_cflags += -DNO_CHECK_BB
 
 mke2fs_shared_libraries := \
@@ -54,7 +56,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(mke2fs_src_files)
 LOCAL_C_INCLUDES := $(mke2fs_c_includes)
-LOCAL_CFLAGS := $(mke2fs_cflags)
+LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux)
 LOCAL_SYSTEM_SHARED_LIBRARIES := $(mke2fs_system_shared_libraries)
 LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
 LOCAL_MODULE := mke2fs
@@ -65,7 +67,11 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(mke2fs_src_files)
 LOCAL_C_INCLUDES := $(mke2fs_c_includes)
+ifeq ($(HOST_OS),linux)
+LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux)
+else
 LOCAL_CFLAGS := $(mke2fs_cflags)
+endif
 LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
 LOCAL_MODULE := mke2fs_host
 LOCAL_MODULE_STEM := mke2fs