7 files changed, 7 insertions, 25 deletions
diff --git a/go/BUILD b/go/BUILD
deleted file mode 100644
index 72a5317..0000000
--- a/go/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-# Description:
-#   cbrotli is a CGo wrapper for Brotli, a generic-purpose lossless compression algorithm.
diff --git a/go/WORKSPACE b/go/WORKSPACE
deleted file mode 100644
index 8a88c7e..0000000
--- a/go/WORKSPACE
+++ /dev/null
@@ -1,16 +0,0 @@
-workspace(name = "org_brotli_go")
-
-local_repository(
-    name = "org_brotli",
-    path = "..",
-)
-
-http_archive(
-    name = "io_bazel_rules_go",
-    urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.12.0/rules_go-0.12.0.tar.gz"],
-    sha256 = "c1f52b8789218bb1542ed362c4f7de7052abcf254d865d96fb7ba6d44bc15ee3",
-)
-
-load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
-go_rules_dependencies()
-go_register_toolchains()
diff --git a/go/cbrotli/BUILD b/go/cbrotli/BUILD
index ce594ad..e045b61 100644..100755
--- a/go/cbrotli/BUILD
+++ b/go/cbrotli/BUILD
@@ -2,25 +2,25 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # MIT
 
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_prefix", "cgo_library", "go_test")
 
-go_library(
+go_prefix("github.com/google/brotli")
+
+cgo_library(
     name = "cbrotli",
     srcs = [
         "reader.go",
         "writer.go",
     ],
     cdeps = [
-        "@org_brotli//:brotlidec",
-        "@org_brotli//:brotlienc",
+        "//:brotlidec",
+        "//:brotlienc",
     ],
-    cgo = True,
-    importpath = "github.com/google/brotli/go/cbrotli",
 )
 
 go_test(
     name = "cbrotli_test",
     size = "small",
     srcs = ["cbrotli_test.go"],
-    embed = [":cbrotli"],
+    library = ":cbrotli",
 )
diff --git a/go/cbrotli/cbrotli_test.go b/go/cbrotli/cbrotli_test.go
index f59ec58..f59ec58 100644..100755
--- a/go/cbrotli/cbrotli_test.go
+++ b/go/cbrotli/cbrotli_test.go
diff --git a/go/cbrotli/cgo.go b/go/cbrotli/cgo.go
index f953f72..f953f72 100644..100755
--- a/go/cbrotli/cgo.go
+++ b/go/cbrotli/cgo.go
diff --git a/go/cbrotli/reader.go b/go/cbrotli/reader.go
index 3d8d424..3d8d424 100644..100755
--- a/go/cbrotli/reader.go
+++ b/go/cbrotli/reader.go
diff --git a/go/cbrotli/writer.go b/go/cbrotli/writer.go
index 9fa75ab..9fa75ab 100644..100755
--- a/go/cbrotli/writer.go
+++ b/go/cbrotli/writer.go