aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Thomson <paulthomson@google.com>2021-02-04 10:05:40 +0000
committerPaul Thomson <paulthomson@google.com>2021-02-04 20:30:41 +0000
commiteccdbca4059ee753975e8f3e96def012bae6573f (patch)
tree1f6c01304e6aa408e2b79f2dd5081eb2bddb9d63
parent43b95da0286d9971bce88025a5939b5b931b18e4 (diff)
downloadSPIRV-Headers-eccdbca4059ee753975e8f3e96def012bae6573f.tar.gz
Update Android.bp
Many additional .json files have been moved into the upstream repo (they used to be in SPIRV-Tools), so several filegroups have been added. Bug: b/169021525 Change-Id: I67d123038041483148ec871e840935dec45e3587
-rw-r--r--Android.bp57
1 files changed, 53 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 60f5a07..6ac12c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,36 @@
+// SPIRV-Tools requires the following filegroups:
+//
+// deqp_spirv_headers_unified1_extinst.debuginfo.grammar.json
+// deqp_spirv_headers_unified1_extinst.glsl.std.450.grammar.json
+// deqp_spirv_headers_unified1_extinst.nonsemantic.clspvreflection.grammar.json
+// deqp_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json
+// deqp_spirv_headers_unified1_extinst.opencl.std.100.grammar.json
+// deqp_spirv_headers_unified1_extinst.spv-amd-gcn-shader.grammar.json
+// deqp_spirv_headers_unified1_extinst.spv-amd-shader-ballot.grammar.json
+// deqp_spirv_headers_unified1_extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json
+// deqp_spirv_headers_unified1_extinst.spv-amd-shader-trinary-minmax.grammar.json
+// deqp_spirv_headers_unified1_spirv.core.grammar.json
+//
+// deqp_spirv_headers_spir-v.xml
filegroup {
- name: "deqp_spirv_headers_unified1_spirv.core.grammar.json",
- srcs: ["include/spirv/unified1/spirv.core.grammar.json"],
+ name: "deqp_spirv_headers_unified1_extinst.debuginfo.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.debuginfo.grammar.json"],
+}
+
+filegroup {
+ name: "deqp_spirv_headers_unified1_extinst.glsl.std.450.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.glsl.std.450.grammar.json"],
+}
+
+filegroup {
+ name: "deqp_spirv_headers_unified1_extinst.nonsemantic.clspvreflection.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json"],
+}
+
+filegroup {
+ name: "deqp_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json"],
}
filegroup {
@@ -10,8 +39,28 @@ filegroup {
}
filegroup {
- name: "deqp_spirv_headers_unified1_extinst.glsl.std.450.grammar.json",
- srcs: ["include/spirv/unified1/extinst.glsl.std.450.grammar.json"],
+ name: "deqp_spirv_headers_unified1_extinst.spv-amd-gcn-shader.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.spv-amd-gcn-shader.grammar.json"],
+}
+
+filegroup {
+ name: "deqp_spirv_headers_unified1_extinst.spv-amd-shader-ballot.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json"],
+}
+
+filegroup {
+ name: "deqp_spirv_headers_unified1_extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json"],
+}
+
+filegroup {
+ name: "deqp_spirv_headers_unified1_extinst.spv-amd-shader-trinary-minmax.grammar.json",
+ srcs: ["include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json"],
+}
+
+filegroup {
+ name: "deqp_spirv_headers_unified1_spirv.core.grammar.json",
+ srcs: ["include/spirv/unified1/spirv.core.grammar.json"],
}
filegroup {