diff options
| author | Andrew Woloszyn <awoloszyn@google.com> | 2016-10-12 14:02:27 -0400 |
|---|---|---|
| committer | Andrew Woloszyn <awoloszyn@google.com> | 2016-10-12 14:02:27 -0400 |
| commit | 2045eadabeaf087452ce1824443b2ed2cc7e62ae (patch) | |
| tree | f9012048c243a2b4365c162f3f445bc89f10ea63 | |
| parent | ab9deb109972bb6031cc8201ea2b97d17451e7e8 (diff) | |
| download | shaderc-2045eadabeaf087452ce1824443b2ed2cc7e62ae.tar.gz | |
Work around bug with abspath on windows.
On windows, abspath will mangle a path that is already absolute instead
of leaving it alone. Use the functions built into the NDK to
only create an absolute path if it is not already absolute.
| -rw-r--r-- | third_party/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/Android.mk b/third_party/Android.mk index eb78abd..c527838 100644 --- a/third_party/Android.mk +++ b/third_party/Android.mk @@ -59,7 +59,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -GLSLANG_OUT_PATH=$(abspath $(TARGET_OUT)) +GLSLANG_OUT_PATH=$(if $(call host-path-is-absolute,$(TARGET_OUT)),$(TARGET_OUT),$(abspath $(TARGET_OUT))) LOCAL_MODULE:=glslang LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_OS_FLAGS) @@ -106,7 +106,7 @@ include $(BUILD_STATIC_LIBRARY) SPVTOOLS_LOCAL_PATH := $(THIRD_PARTY_PATH)/spirv-tools LOCAL_PATH := $(SPVTOOLS_LOCAL_PATH) -SPVTOOLS_OUT_PATH=$(abspath $(TARGET_OUT)) +SPVTOOLS_OUT_PATH=$(if $(call host-path-is-absolute,$(TARGET_OUT)),$(TARGET_OUT),$(abspath $(TARGET_OUT))) SPVHEADERS_LOCAL_PATH := $(THIRD_PARTY_PATH)/spirv-tools/external/spirv-headers # Locations of grammar files. |