commit 1ef9076a4195e2135bed84ed2ef1be60443f3c4f
author Alexis Hetu <sugoi@google.com> Tue Nov 09 17:23:47 2021 -0500
committer Alexis Hétu <sugoi@google.com> Tue Nov 09 23:30:33 2021 +0000
tree 84254bf99668e3419e20f1113b3d0ecc78fbad5d
parent 7cf6e518fd1bddbff96f1ecb67b18a06faff77ab

Follow-up 2: Fix Android.bp build after SPIRV-Tools update

Bug: b/123642959
Change-Id: Ibb416c798feb57af85e3299ad4c063e6aa93e58e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/59268
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-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 286b16f..c6ae2b4 100644
--- a/third_party/SPIRV-Tools/Android.bp
+++ b/third_party/SPIRV-Tools/Android.bp
@@ -99,7 +99,7 @@
         "$(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-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=; "
+        "$(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_; "
 }
 
 genrule {