android: fix Mac build

Disable building debugfs and e4crypt on mac.
Add missing time.h include in ext2fs.h for time_t.

From AOSP commit: f2b2d2c0a6af8bd1e1a19150cf9d41d8f2b0e39a

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/contrib/Android.mk b/contrib/Android.mk
index 282d47e114b5d202ae0bbf1f933706344f69c967..f8d74c30e45381149a6178220553b64b7e21dbb2 100644 (file)
--- a/contrib/Android.mk
+++ b/contrib/Android.mk
@@ -31,6 +31,7 @@ LOCAL_CFLAGS := $(fsstress_cflags)
 LOCAL_MODULE := fsstress_host
 LOCAL_MODULE_STEM := fsstress
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := linux
 
 include $(BUILD_HOST_EXECUTABLE)
 

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 4cf3c5bbd91be27b5d81a256a8baa3c355d3e459..786ded80b9452e35c8a0592cee7d11dca6e7ca44 100644 (file)
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -60,6 +60,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <errno.h>
 
 #if EXT2_FLAT_INCLUDES

diff --git a/misc/Android.mk b/misc/Android.mk
index 55f2767e21ae2e1b88aa5608993bd461e38d546c..d960737238311d8a4dff0e5475326d93bca4d04c 100644 (file)
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -341,6 +341,7 @@ LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e4crypt_shared_libraries))
 LOCAL_MODULE := e4crypt_host
 LOCAL_MODULE_STEM := e4crypt
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := linux
 
 include $(BUILD_HOST_EXECUTABLE)