commit cae02657be05e7f016cb261fc9fffdc96dd1b9cd
author Jeff Sharkey <jsharkey@android.com> Fri Sep 20 18:06:46 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 20 18:06:46 2013 -0700
tree 0aebfdcddcea718310da35d9b98a6470af00db81
parent 7e82a37327c7abe1927c25f030a3eb7233895f1e
parent 500f3ffad43d115faad38f4ed2c32a08b694f183

am 500f3ffa: am 0ee7d8c6: Fix Mac builds, for realz.

* commit '500f3ffad43d115faad38f4ed2c32a08b694f183':
  Fix Mac builds, for realz.

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 5281385..0fd5a57 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -65,6 +65,12 @@
     WINDOWS_HOST_ONLY := 1
 endif
 
+ifneq ($(WINDOWS_HOST_ONLY),1)
+    commonSources += \
+        fs.c \
+        multiuser.c
+endif
+
 
 # Static library for host
 # ========================================================
@@ -101,9 +107,7 @@
         android_reboot.c \
         ashmem-dev.c \
         debugger.c \
-        fs.c \
         klog.c \
-        multiuser.c \
         partition_utils.c \
         properties.c \
         qtaguid.c \

libcutils/fs.c

diff --git a/libcutils/fs.c b/libcutils/fs.c
index 8d1da21..286a8eb 100644
--- a/libcutils/fs.c
+++ b/libcutils/fs.c
@@ -148,6 +148,8 @@
     return -1;
 }
 
+#ifndef __APPLE__
+
 int fs_mkdirs(const char* path, mode_t mode) {
     int res = 0;
     int fd = 0;
@@ -231,3 +233,5 @@
     free(buf);
     return res;
 }
+
+#endif