From 05e7f37a4a7703435f589b50222bf67615a1788c Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 24 Oct 2016 15:18:09 -0400 Subject: [PATCH] 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 --- contrib/Android.mk | 1 + lib/ext2fs/ext2fs.h | 1 + misc/Android.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/contrib/Android.mk b/contrib/Android.mk index 282d47e..f8d74c3 100644 --- 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 4cf3c5b..786ded8 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -60,6 +60,7 @@ extern "C" { #include #include #include +#include #include #if EXT2_FLAT_INCLUDES diff --git a/misc/Android.mk b/misc/Android.mk index 55f2767..d960737 100644 --- 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) -- 1.8.3.1