diff options
| author | David Neto <dneto@google.com> | 2016-10-19 10:54:30 -0400 |
|---|---|---|
| committer | David Neto <dneto@google.com> | 2016-10-19 11:21:08 -0400 |
| commit | d65b38bd6b95dea19e02814eb776dd1738aae0da (patch) | |
| tree | 55698f980750e340c9b1ded904aa319928eb09ad | |
| parent | b10627c37da21f2b5552ede269bda314d55e2fc8 (diff) | |
| parent | ac2c9b372c070cc4678479617516957cf99f6db8 (diff) | |
| download | shaderc-d65b38bd6b95dea19e02814eb776dd1738aae0da.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into update-shadercndk-r14-beta1
Includes the following:
ac2c9b3 Enable AMD extensions for Glslang by default.
2045ead Work around bug with abspath on windows.
Test: checkbuild.py for Linux, Windows; ran unit tests on Windows
Change-Id: Ib598579b741f57ea4d276ab02c40da4f4ce8ef45
| -rw-r--r-- | third_party/Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/third_party/Android.mk b/third_party/Android.mk index eb78abd..7f6e04c 100644 --- a/third_party/Android.mk +++ b/third_party/Android.mk @@ -4,10 +4,12 @@ GLSLANG_LOCAL_PATH := $(THIRD_PARTY_PATH)/glslang LOCAL_PATH := $(GLSLANG_LOCAL_PATH) GLSLANG_OS_FLAGS := -DGLSLANG_OSINCLUDE_UNIX +# AMD extensions are turned on by default in upstream Glslang. +GLSLANG_DEFINES:= -DAMD_EXTENSIONS $(GLSLANG_OS_FLAGS) include $(CLEAR_VARS) LOCAL_MODULE:=SPIRV -LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_OS_FLAGS) +LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_DEFINES) LOCAL_EXPORT_C_INCLUDES:=$(GLSLANG_LOCAL_PATH) LOCAL_SRC_FILES:= \ SPIRV/GlslangToSpv.cpp \ @@ -24,7 +26,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE:=OSDependent -LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_OS_FLAGS) +LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_DEFINES) LOCAL_EXPORT_C_INCLUDES:=$(GLSLANG_LOCAL_PATH) LOCAL_SRC_FILES:=glslang/OSDependent/Unix/ossource.cpp LOCAL_C_INCLUDES:=$(GLSLANG_LOCAL_PATH) $(GLSLANG_LOCAL_PATH)/glslang/OSDependent/Unix/ @@ -33,7 +35,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE:=OGLCompiler -LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_OS_FLAGS) +LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_DEFINES) LOCAL_EXPORT_C_INCLUDES:=$(GLSLANG_LOCAL_PATH) LOCAL_SRC_FILES:=OGLCompilersDLL/InitializeDll.cpp LOCAL_C_INCLUDES:=$(GLSLANG_LOCAL_PATH)/OGLCompiler @@ -59,10 +61,10 @@ 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) +LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti $(GLSLANG_DEFINES) LOCAL_EXPORT_C_INCLUDES:=$(GLSLANG_LOCAL_PATH) LOCAL_SRC_FILES:= \ @@ -106,7 +108,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. |