Clean up Mac OS hacks in acp slightly.

Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
This commit is contained in:
Elliott Hughes
2016-01-05 09:26:54 -08:00
parent b11bf3f70c
commit 636c1c4a44
4 changed files with 6 additions and 13 deletions

View File

@@ -5,11 +5,11 @@ LOCAL_SRC_FILES:= \
CopyFile.c
LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS_darwin += -DMACOSX_RSRC
LOCAL_MODULE:= libhost
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CXX_STL := none
# acp uses libhost, so we can't use

View File

@@ -68,8 +68,8 @@ static bool isSourceNewer(const struct stat* pSrcStat, const struct stat* pDstSt
static bool isHiresMtime(const struct stat* pSrcStat)
{
#if defined(_WIN32)
return 0;
#elif defined(MACOSX_RSRC)
return 0;
#elif defined(__APPLE__)
return pSrcStat->st_mtimespec.tv_nsec > 0;
#else
return pSrcStat->st_mtim.tv_nsec > 0;
@@ -295,7 +295,8 @@ static int copyRegular(const char* src, const char* dst, const struct stat* pSrc
if (copyResult != 0)
return -1;
#ifdef MACOSX_RSRC
#if defined(__APPLE__)
// Copy Mac OS X resource forks too.
{
char* srcRsrcName = NULL;
char* dstRsrcName = NULL;