Merge "Clean up Mac OS hacks in acp slightly." (0e80edd2) · Commits · e / os / android_build

libs/host/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+4 −3

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ static bool isHiresMtime(const struct stat* pSrcStat)
		{
		#if defined(_WIN32)
		return 0;
		#elif defined(MACOSX_RSRC)
		#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;

+1 −8

Original line number	Diff line number	Diff line
		@@ -3,20 +3,13 @@
		# Custom version of cp.

		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_SRC_FILES := \
		acp.c

		ifeq ($(HOST_OS),darwin)
		LOCAL_CFLAGS += -DMACOSX_RSRC
		endif
		ifeq ($(HOST_OS),linux)
		endif

		LOCAL_STATIC_LIBRARIES := libhost
		LOCAL_C_INCLUDES := build/libs/host/include
		LOCAL_MODULE := acp
		LOCAL_ACP_UNAVAILABLE := true
		LOCAL_CXX_STL := none

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ LOCAL_SRC_FILES := \

		LOCAL_STATIC_LIBRARIES := \
		libhost
		LOCAL_C_INCLUDES := build/libs/host/include

		LOCAL_MODULE := atree