diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ff46b45
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,106 @@
+// 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.nonsemantic.shader.debuginfo.100.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
+
+package {
+    default_applicable_licenses: ["external_deqp-deps_SPIRV-Headers_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "external_deqp-deps_SPIRV-Headers_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
+filegroup {
+    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.nonsemantic.shader.debuginfo.100.grammar.json",
+    srcs: ["include/spirv/unified1/extinst.nonsemantic.shader.debuginfo.100.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 {
+    name: "deqp_spirv_headers_unified1_extinst.opencl.std.100.grammar.json",
+    srcs: ["include/spirv/unified1/extinst.opencl.std.100.grammar.json"],
+}
+
+filegroup {
+    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 {
+    name: "deqp_spirv_headers_spir-v.xml",
+    srcs: ["include/spirv/spir-v.xml"],
+}
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..59680f8
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,13 @@
+name: "SPIRV-Headers"
+description:
+    "This repository contains machine-readable files for the SPIR-V Registry."
+
+third_party {
+  url {
+    type: GIT
+    value: "https://github.com/KhronosGroup/SPIRV-Headers.git"
+  }
+  version: "d5b2e1255f706ce1f88812217e9a554f299848af"
+  license_type: NOTICE
+  last_upgrade_date { year: 2018 month: 12 day: 17 }
+}
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_BSD
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..ca2b824
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1 @@
+include platform/external/deqp:/OWNERS