diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-09-20 18:04:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-20 18:04:53 -0700 |
| commit | 500f3ffad43d115faad38f4ed2c32a08b694f183 (patch) | |
| tree | 2341c702306b03074f8c35140b457fb77e74d946 | |
| parent | 68955fc82edc2b4a3b61712a9fb9c80a705ba4c0 (diff) | |
| parent | 0ee7d8c68b57c02d02f707d6f71c731234d56eec (diff) | |
| download | system_core-500f3ffad43d115faad38f4ed2c32a08b694f183.zip system_core-500f3ffad43d115faad38f4ed2c32a08b694f183.tar.gz system_core-500f3ffad43d115faad38f4ed2c32a08b694f183.tar.bz2 | |
am 0ee7d8c6: Fix Mac builds, for realz.
* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
Fix Mac builds, for realz.
| -rw-r--r-- | libcutils/Android.mk | 8 | ||||
| -rw-r--r-- | libcutils/fs.c | 4 |
2 files changed, 10 insertions, 2 deletions
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 @@ 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 8d1da21..286a8eb 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 |