diff options
| author | Yang Ni <yangni@google.com> | 2016-12-12 22:27:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-12 22:27:11 +0000 |
| commit | 239f015d172e8d16daa6ddf4830d8b2b241d5215 (patch) | |
| tree | bb484f51912009ab247e2c67c00c7d4adde075f8 | |
| parent | 31ce82c3db81fa5cbf9f41388b660b971329e3b9 (diff) | |
| parent | 50a8255965b7280b276b6ac6f15e17f188b04267 (diff) | |
| download | spirv-llvm-239f015d172e8d16daa6ddf4830d8b2b241d5215.tar.gz | |
Merge "Enable darwin build" am: a117dc79f7 am: 12476d414a
am: 50a8255965
Change-Id: Ib48f30794a5cf7395d8eb598d1c97f0ae6722c54
| -rw-r--r-- | lib/SPIRV/Android.mk | 5 | ||||
| -rw-r--r-- | tools/llvm-spirv/Android.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/SPIRV/Android.mk b/lib/SPIRV/Android.mk index 2e669d76..65b74378 100644 --- a/lib/SPIRV/Android.mk +++ b/lib/SPIRV/Android.mk @@ -87,14 +87,15 @@ LOCAL_MODULE := libSPIRV # 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 \ diff --git a/tools/llvm-spirv/Android.mk b/tools/llvm-spirv/Android.mk index 20c9f5da..ec7f3b28 100644 --- a/tools/llvm-spirv/Android.mk +++ b/tools/llvm-spirv/Android.mk @@ -49,12 +49,13 @@ LOCAL_MODULE_CLASS := EXECUTABLES # 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 \ |