From 0ee7d8c68b57c02d02f707d6f71c731234d56eec Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 20 Sep 2013 17:58:54 -0700
Subject: [PATCH] Fix Mac builds, for realz.
Change-Id: I63e21b90e5b8a8f016dd04ceca4354793faa5e37
---
libcutils/Android.mk | 8 ++++++--
libcutils/fs.c | 4 ++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 5281385149..0fd5a57e03 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -65,6 +65,12 @@ ifneq ($(strip $(USE_MINGW)),)
WINDOWS_HOST_ONLY := 1
endif
+ifneq ($(WINDOWS_HOST_ONLY),1)
+ commonSources += \
+ fs.c \
+ multiuser.c
+endif
+
# Static library for host
# ========================================================
@@ -101,9 +107,7 @@ LOCAL_SRC_FILES := $(commonSources) \
android_reboot.c \
ashmem-dev.c \
debugger.c \
- fs.c \
klog.c \
- multiuser.c \
partition_utils.c \
properties.c \
qtaguid.c \
diff --git a/libcutils/fs.c b/libcutils/fs.c
index 8d1da21c83..286a8eb090 100644
--- a/libcutils/fs.c
+++ b/libcutils/fs.c
@@ -148,6 +148,8 @@ fail_closed:
return -1;
}
+#ifndef __APPLE__
+
int fs_mkdirs(const char* path, mode_t mode) {
int res = 0;
int fd = 0;
@@ -231,3 +233,5 @@ done:
free(buf);
return res;
}
+
+#endif
--
GitLab