commit de3f38a72c486c14a5cfe0810af9871acb7dec9a
author Alexis Hetu <sugoi@google.com> Fri Mar 27 16:25:45 2020 -0400
committer Alexis Hétu <sugoi@google.com> Fri Mar 27 20:30:37 2020 +0000
tree 85caea8474ff1584694d6cbbf0a2a87a705302d5
parent 1360648de7cdb27c2ecbf8fec1f949f008dfb0ca

Fix Android.bp following the SPIRV-Tools update

Following the SPIRV-Tools update, Android.bp needs to be manually
updated to reflect the changes made in SPIRV-Tools.

This change was tested with SwANGLE on Android.

Bug: b/123642959
Change-Id: I3ba86796a0a5e75d642ef13a0f06735035f1bd5c
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43128
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Chris Forbes <chrisforbes@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 8c8ef6c..765f90a 100644
--- a/third_party/SPIRV-Tools/Android.bp
+++ b/third_party/SPIRV-Tools/Android.bp
@@ -76,8 +76,8 @@
     ],
     tool_files: ["utils/generate_language_headers.py"],
     cmd: 
-        "$(location) --extinst-name=DebugInfo --extinst-grammar=$(location source/extinst.debuginfo.grammar.json) --extinst-output-base=$$(dirname $(location DebugInfo.h))/DebugInfo; "+
-        "$(location) --extinst-name=OpenCLDebugInfo100 --extinst-grammar=$(location source/extinst.opencl.debuginfo.100.grammar.json) --extinst-output-base=$$(dirname $(location OpenCLDebugInfo100.h))/OpenCLDebugInfo100; "
+        "$(location) --extinst-grammar=$(location source/extinst.debuginfo.grammar.json) --extinst-output-path=$(location DebugInfo.h); "+
+        "$(location) --extinst-grammar=$(location source/extinst.opencl.debuginfo.100.grammar.json) --extinst-output-path=$(location OpenCLDebugInfo100.h); "
 }
 
 genrule {