commit 12476d414abff14c9cbf7ba2de375aa866f77349
author Yang Ni <yangni@google.com> Mon Dec 12 22:14:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 12 22:14:41 2016 +0000
tree bb484f51912009ab247e2c67c00c7d4adde075f8
parent b7af82162dc5eafdf2ac19fd0160ecc5c7741dde
parent a117dc79f70fba5621c3f809c4c5847409620bab

Merge "Enable darwin build"
am: a117dc79f7

Change-Id: I845a240c8e59264fe49b3961e95f9179ea6aec4d

lib/SPIRV/Android.mk

diff --git a/lib/SPIRV/Android.mk b/lib/SPIRV/Android.mk
index 2e669d7..65b7437 100644
--- a/lib/SPIRV/Android.mk
+++ b/lib/SPIRV/Android.mk
@@ -87,14 +87,15 @@
 
 # TODO: test windows build
 
-LOCAL_MODULE_HOST_OS := linux
+LOCAL_MODULE_HOST_OS := linux darwin
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_IS_HOST_MODULE := true
 LOCAL_MULTILIB := first
 
 LOCAL_LDLIBS_linux := -lrt -ldl -ltinfo -lpthread
+LOCAL_LDLIBS_darwin := -ldl -lpthread
 
-LOCAL_SHARED_LIBRARIES_linux += libLLVM
+LOCAL_SHARED_LIBRARIES += libLLVM
 
 LOCAL_CFLAGS += $(TOOL_CFLAGS) \
   -D_SPIRV_LLVM_API \

tools/llvm-spirv/Android.mk

diff --git a/tools/llvm-spirv/Android.mk b/tools/llvm-spirv/Android.mk
index 20c9f5d..ec7f3b2 100644
--- a/tools/llvm-spirv/Android.mk
+++ b/tools/llvm-spirv/Android.mk
@@ -49,12 +49,13 @@
 
 # TODO: handle windows and darwin
 
-LOCAL_MODULE_HOST_OS := linux
+LOCAL_MODULE_HOST_OS := linux darwin
 LOCAL_IS_HOST_MODULE := true
 
 LOCAL_LDLIBS_linux := -lrt -ldl -ltinfo -lpthread
+LOCAL_LDLIBS_darwin := -ldl -lpthread
 
-LOCAL_SHARED_LIBRARIES_linux += libLLVM libSPIRV
+LOCAL_SHARED_LIBRARIES += libLLVM libSPIRV
 
 LOCAL_CFLAGS += $(TOOL_CFLAGS) \
   -D_SPIRV_LLVM_API \