commit 293da54db09df0747c18f06023d7673a47b918d1
author Nicolas Capens <capn@google.com> Wed Nov 23 22:26:33 2022 -0500
committer Nicolas Capens <nicolascapens@google.com> Thu Nov 24 03:34:32 2022 +0000
tree 7ff810ec5acb882defde835d968fe9ebca003cca
parent 95c2e209db6cfcd30ebd88f0cb78b5f747a44db3

Fix SPIRV-Tools Android.bp build, part two

Matches the Android.mk and BUILD.gn change made as part of
https://github.com/KhronosGroup/SPIRV-Tools/issues/4960

https://swiftshader-review.googlesource.com/c/SwiftShader/+/69848
was missing the --output-language=c++ option on the build commands for
glsl.std.450.insts.inc and opencl.std.insts.inc.

Note that Android.mk generates the affected include files in just two
combined commands (BUILD.gn does it in three), while Android.bp invokes
utils/generate_grammar_tables.py four times for the same files. Hence
why the previous patch missed two more uses of the new command option.

Bug: b/123642959
Change-Id: Ib694547499137f01e495e41800f7b98d6a419c1f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/69869
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

third_party/SPIRV-Tools/Android.bp

diff --git a/third_party/SPIRV-Tools/Android.bp b/third_party/SPIRV-Tools/Android.bp
index 8b06d20..3739ae0 100644
--- a/third_party/SPIRV-Tools/Android.bp
+++ b/third_party/SPIRV-Tools/Android.bp
@@ -96,8 +96,8 @@
         "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-trinary-minmax.grammar.json) --vendor-insts-output=$(location spv-amd-shader-trinary-minmax.insts.inc) --vendor-operand-kind-prefix=; "+
         "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json) --vendor-insts-output=$(location opencl.debuginfo.100.insts.inc) --vendor-operand-kind-prefix=CLDEBUG100_; "+
         "$(location) --spirv-core-grammar=$(location :swiftshader_spirv_headers_unified1_spirv.core.grammar.json) --extinst-debuginfo-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.debuginfo.grammar.json) --extinst-cldebuginfo100-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json) --extension-enum-output=$(location extension_enum.inc) --enum-string-mapping-output=$(location enum_string_mapping.inc) --output-language=c++; "+
-        "$(location) --extinst-opencl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.std.100.grammar.json) --opencl-insts-output=$(location opencl.std.insts.inc); "+
-        "$(location) --extinst-glsl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.glsl.std.450.grammar.json) --glsl-insts-output=$(location glsl.std.450.insts.inc); " +
+        "$(location) --extinst-opencl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.std.100.grammar.json) --opencl-insts-output=$(location opencl.std.insts.inc) --output-language=c++; "+
+        "$(location) --extinst-glsl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.glsl.std.450.grammar.json) --glsl-insts-output=$(location glsl.std.450.insts.inc) --output-language=c++; " +
         "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.nonsemantic.clspvreflection.grammar.json) --vendor-insts-output=$(location nonsemantic.clspvreflection.insts.inc) --vendor-operand-kind-prefix=; " +
         "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.nonsemantic.shader.debuginfo.100.grammar.json) --vendor-insts-output=$(location nonsemantic.shader.debuginfo.100.insts.inc) --vendor-operand-kind-prefix=SHDEBUG100_; "
 }