diff options
author | dan sinclair <dj2@everburning.com> | 2018-12-11 15:11:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-11 15:11:15 -0500 |
commit | fb1ade89cc3b73c63c4295d3b2b6eddfd8972a6b (patch) | |
tree | bc87ed570dfa620420fffee9f4f70dcc4c17993b /Android.mk | |
parent | 4566ccba2cee294a043b272e728b5d2cdc08bba1 (diff) | |
download | amber-fb1ade89cc3b73c63c4295d3b2b6eddfd8972a6b.tar.gz |
Merge scripts and executors. (#170)
This CL merges the vk and amber Script classes along with the vk and
amber Executor classes.
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -5,10 +5,7 @@ LOCAL_MODULE:=amber LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti LOCAL_SRC_FILES:= \ src/amber.cc \ - src/amberscript/executor.cc \ src/amberscript/parser.cc \ - src/amberscript/pipeline.cc \ - src/amberscript/script.cc \ src/buffer.cc \ src/command.cc \ src/command_data.cc \ @@ -17,6 +14,7 @@ LOCAL_SRC_FILES:= \ src/executor.cc \ src/format.cc \ src/parser.cc \ + src/pipeline.cc \ src/pipeline_data.cc \ src/recipe.cc \ src/result.cc \ @@ -28,10 +26,8 @@ LOCAL_SRC_FILES:= \ src/verifier.cc \ src/vkscript/command_parser.cc \ src/vkscript/datum_type_parser.cc \ - src/vkscript/executor.cc \ src/vkscript/format_parser.cc \ src/vkscript/parser.cc \ - src/vkscript/script.cc \ src/vkscript/section_parser.cc LOCAL_STATIC_LIBRARIES:=glslang SPIRV-Tools shaderc LOCAL_C_INCLUDES:=$(LOCAL_PATH)/include |