diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..531562b
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,219 @@
+// Copyright 2017 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+bootstrap_go_package {
+    name: "protoc-gen-go_descriptor",
+    pkgPath: "github.com/golang/protobuf/protoc-gen-go/descriptor",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["protoc-gen-go/descriptor/descriptor.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "protoc-gen-go_plugin",
+    pkgPath: "github.com/golang/protobuf/protoc-gen-go/plugin",
+    deps: [
+        "golang-protobuf-proto",
+        "protoc-gen-go_descriptor",
+    ],
+    srcs: ["protoc-gen-go/plugin/plugin.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "protoc-gen-go_generator_internal_remap",
+    pkgPath: "github.com/golang/protobuf/protoc-gen-go/generator/internal/remap",
+    srcs: ["protoc-gen-go/generator/internal/remap/remap.go"],
+    testSrcs: ["protoc-gen-go/generator/internal/remap/remap_test.go"],
+}
+
+bootstrap_go_package {
+    name: "protoc-gen-go_generator",
+    pkgPath: "github.com/golang/protobuf/protoc-gen-go/generator",
+    deps: [
+        "golang-protobuf-proto",
+        "protoc-gen-go_descriptor",
+        "protoc-gen-go_plugin",
+        "protoc-gen-go_generator_internal_remap",
+    ],
+    srcs: ["protoc-gen-go/generator/generator.go"],
+    testSrcs: ["protoc-gen-go/generator/name_test.go"],
+}
+
+bootstrap_go_package {
+    name: "protoc-gen-go_grpc",
+    pkgPath: "github.com/golang/protobuf/protoc-gen-go/grpc",
+    deps: [
+        "protoc-gen-go_descriptor",
+        "protoc-gen-go_generator",
+    ],
+    srcs: ["protoc-gen-go/grpc/grpc.go"],
+}
+
+blueprint_go_binary {
+    name: "protoc-gen-go",
+    deps: [
+        "golang-protobuf-proto",
+        "protoc-gen-go_generator",
+        "protoc-gen-go_grpc",
+    ],
+    srcs: [
+        "protoc-gen-go/main.go",
+        "protoc-gen-go/link_grpc.go",
+    ],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-proto",
+    pkgPath: "github.com/golang/protobuf/proto",
+    srcs: [
+        "proto/clone.go",
+        "proto/decode.go",
+        "proto/discard.go",
+        "proto/encode.go",
+        "proto/equal.go",
+        "proto/extensions.go",
+        "proto/lib.go",
+        "proto/message_set.go",
+        "proto/table_marshal.go",
+        "proto/table_merge.go",
+        "proto/table_unmarshal.go",
+        "proto/pointer_unsafe.go",
+        "proto/properties.go",
+        "proto/text.go",
+        "proto/text_parser.go",
+    ],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-proto-proto3_proto",
+    pkgPath: "github.com/golang/protobuf/proto/proto3_proto",
+    deps: [
+        "golang-protobuf-proto",
+        "golang-protobuf-proto-test-proto",
+        "golang-protobuf-ptypes-any",
+    ],
+    srcs: ["proto/proto3_proto/proto3.pb.go"],
+}
+
+// These won't run by default (they also print output, which we don't want), but
+// can be run with:
+//  m out/soong/.bootstrap/golang-protobuf-proto_test/test/test.passed
+bootstrap_go_package {
+    name: "golang-protobuf-proto_test",
+    pkgPath: "github.com/golang/protobuf/proto_test",
+    deps: [
+        "golang-protobuf-proto",
+        "golang-protobuf-proto-proto3_proto",
+        "golang-protobuf-proto-test-proto",
+        "golang-protobuf-ptypes",
+    ],
+    testSrcs: [
+        "proto/all_test.go",
+        "proto/any_test.go",
+        "proto/clone_test.go",
+        "proto/decode_test.go",
+        "proto/encode_test.go",
+        "proto/equal_test.go",
+        // Requires golang.org/x/sync/errgroup
+        //"proto/extensions_test.go",
+        "proto/map_test.go",
+        "proto/message_set_test.go",
+        "proto/proto3_test.go",
+        "proto/size_test.go",
+        "proto/size2_test.go",
+        "proto/text_parser_test.go",
+        "proto/text_test.go",
+    ],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-proto-test-proto",
+    pkgPath: "github.com/golang/protobuf/proto/test_proto",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["proto/test_proto/test.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-ptypes",
+    pkgPath: "github.com/golang/protobuf/ptypes",
+    deps: [
+        "golang-protobuf-proto",
+        "golang-protobuf-ptypes-any",
+        "golang-protobuf-ptypes-duration",
+        "golang-protobuf-ptypes-timestamp",
+        "protoc-gen-go_descriptor",
+    ],
+    srcs: [
+        "ptypes/any.go",
+        "ptypes/doc.go",
+        "ptypes/duration.go",
+        "ptypes/timestamp.go",
+    ],
+    testSrcs: [
+        "ptypes/any_test.go",
+        "ptypes/duration_test.go",
+        "ptypes/timestamp_test.go",
+    ],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-ptypes-any",
+    pkgPath: "github.com/golang/protobuf/ptypes/any",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["ptypes/any/any.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-ptypes-duration",
+    pkgPath: "github.com/golang/protobuf/ptypes/duration",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["ptypes/duration/duration.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-ptypes-empty",
+    pkgPath: "github.com/golang/protobuf/ptypes/empty",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["ptypes/empty/empty.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-ptypes-struct",
+    pkgPath: "github.com/golang/protobuf/ptypes/struct",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["ptypes/struct/struct.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-ptypes-timestamp",
+    pkgPath: "github.com/golang/protobuf/ptypes/timestamp",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["ptypes/timestamp/timestamp.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-ptypes-wrappers",
+    pkgPath: "github.com/golang/protobuf/ptypes/wrappers",
+    deps: ["golang-protobuf-proto"],
+    srcs: ["ptypes/wrappers/wrappers.pb.go"],
+}
+
+bootstrap_go_package {
+    name: "golang-protobuf-jsonpb",
+    pkgPath: "github.com/golang/protobuf/jsonpb",
+    srcs: ["jsonpb/jsonpb.go"],
+    deps: [
+        "golang-protobuf-proto",
+        "golang-protobuf-ptypes-struct",
+    ],
+}
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..cfd2016
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,17 @@
+name: "golang-protobuf"
+third_party {
+  url {
+    type: HOMEPAGE
+    value: "https://github.com/golang/protobuf"
+  }
+  url {
+    type: GIT
+    value: "https://github.com/golang/protobuf"
+  }
+  version: "v1.3.5"
+  last_upgrade_date {
+    year: 2020
+    month: 3
+    day: 12
+  }
+}
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..23a6257
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+dwillemsen@google.com
+ccross@android.com