am 0ee7d8c6: Fix Mac builds, for realz.

* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
  Fix Mac builds, for realz.
This commit is contained in:
Jeff Sharkey 2013-09-20 18:04:53 -07:00 committed by Android Git Automerger
commit 500f3ffad4
2 changed files with 10 additions and 2 deletions

View file

@ -65,6 +65,12 @@ ifneq ($(strip $(USE_MINGW)),)
WINDOWS_HOST_ONLY := 1 WINDOWS_HOST_ONLY := 1
endif endif
ifneq ($(WINDOWS_HOST_ONLY),1)
commonSources += \
fs.c \
multiuser.c
endif
# Static library for host # Static library for host
# ======================================================== # ========================================================
@ -101,9 +107,7 @@ LOCAL_SRC_FILES := $(commonSources) \
android_reboot.c \ android_reboot.c \
ashmem-dev.c \ ashmem-dev.c \
debugger.c \ debugger.c \
fs.c \
klog.c \ klog.c \
multiuser.c \
partition_utils.c \ partition_utils.c \
properties.c \ properties.c \
qtaguid.c \ qtaguid.c \

View file

@ -148,6 +148,8 @@ fail_closed:
return -1; return -1;
} }
#ifndef __APPLE__
int fs_mkdirs(const char* path, mode_t mode) { int fs_mkdirs(const char* path, mode_t mode) {
int res = 0; int res = 0;
int fd = 0; int fd = 0;
@ -231,3 +233,5 @@ done:
free(buf); free(buf);
return res; return res;
} }
#endif