diff options
| author | Lei Zhang <antiagainst@google.com> | 2016-09-19 17:34:09 -0400 |
|---|---|---|
| committer | Lei Zhang <antiagainst@google.com> | 2016-09-21 14:22:24 -0400 |
| commit | ef03d81c179e6a3b47119c45a9ede25c21944542 (patch) | |
| tree | 37f82cf485fe9717c20064964d7b18f2aad9f93b | |
| parent | 6b3903085ca832a5f779a7c38fd63dd361bd5fef (diff) | |
| download | shaderc-ef03d81c179e6a3b47119c45a9ede25c21944542.tar.gz | |
Add the SPIRV-Tools-opt library into Android.mk.
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | libshaderc/Android.mk | 2 | ||||
| -rw-r--r-- | libshaderc_util/Android.mk | 2 | ||||
| -rw-r--r-- | third_party/Android.mk | 28 |
4 files changed, 32 insertions, 3 deletions
@@ -11,7 +11,8 @@ ALL_LIBS:=libglslang.a \ libshaderc_util.a \ libSPIRV.a \ libHLSL.a \ - libSPIRV-Tools.a + libSPIRV-Tools.a \ + libSPIRV-Tools-opt.a define gen_libshaderc $(1)/combine.ar: $(addprefix $(1)/, $(ALL_LIBS)) diff --git a/libshaderc/Android.mk b/libshaderc/Android.mk index 4b1a74b..13d5057 100644 --- a/libshaderc/Android.mk +++ b/libshaderc/Android.mk @@ -6,7 +6,7 @@ LOCAL_MODULE:=shaderc LOCAL_EXPORT_C_INCLUDES:=$(LOCAL_PATH)/include LOCAL_SRC_FILES:=src/shaderc.cc LOCAL_C_INCLUDES:=$(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES=shaderc_util SPIRV-Tools +LOCAL_STATIC_LIBRARIES:=shaderc_util SPIRV-Tools-opt LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti LOCAL_EXPORT_CPPFLAGS:=-std=c++11 LOCAL_EXPORT_LDFLAGS:=-latomic diff --git a/libshaderc_util/Android.mk b/libshaderc_util/Android.mk index e561588..13c9f0a 100644 --- a/libshaderc_util/Android.mk +++ b/libshaderc_util/Android.mk @@ -12,6 +12,6 @@ LOCAL_SRC_FILES:=src/compiler.cc \ src/shader_stage.cc \ src/spirv_tools_wrapper.cc \ src/version_profile.cc -LOCAL_STATIC_LIBRARIES:=glslang SPIRV-Tools +LOCAL_STATIC_LIBRARIES:=glslang SPIRV-Tools-opt LOCAL_C_INCLUDES:=$(LOCAL_PATH)/include include $(BUILD_STATIC_LIBRARY) diff --git a/third_party/Android.mk b/third_party/Android.mk index c9827fc..b212c79 100644 --- a/third_party/Android.mk +++ b/third_party/Android.mk @@ -174,6 +174,7 @@ LOCAL_SRC_FILES:= \ source/disassemble.cpp \ source/ext_inst.cpp \ source/instruction.cpp \ + source/libspirv.cpp \ source/name_mapper.cpp \ source/opcode.cpp \ source/operand.cpp \ @@ -196,3 +197,30 @@ LOCAL_SRC_FILES:= \ source/validate_instruction.cpp \ source/validate_layout.cpp include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := SPIRV-Tools-opt +LOCAL_C_INCLUDES := \ + $(SPVTOOLS_LOCAL_PATH)/include \ + $(SPVTOOLS_LOCAL_PATH)/source \ + $(SPVTOOLS_LOCAL_PATH)/external/spirv-headers/include +LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti +LOCAL_STATIC_LIBRARIES:=SPIRV-Tools +LOCAL_SRC_FILES:= \ + source/opt/build_module.cpp \ + source/opt/def_use_manager.cpp \ + source/opt/eliminate_dead_constant_pass.cpp \ + source/opt/fold_spec_constant_op_and_composite_pass.cpp \ + source/opt/freeze_spec_constant_value_pass.cpp \ + source/opt/function.cpp \ + source/opt/instruction.cpp \ + source/opt/ir_loader.cpp \ + source/opt/module.cpp \ + source/opt/optimizer.cpp \ + source/opt/pass_manager.cpp \ + source/opt/set_spec_constant_default_value_pass.cpp \ + source/opt/strip_debug_info_pass.cpp \ + source/opt/type_manager.cpp \ + source/opt/types.cpp \ + source/opt/unify_const_pass.cpp +include $(BUILD_STATIC_LIBRARY) |