1 files changed, 43 insertions, 16 deletions
diff --git a/WORKSPACE b/WORKSPACE
index c3f18cc7..58e7a832 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,28 +1,55 @@
-new_http_archive(
-  name = "gmock_archive",
-  url = "https://googlemock.googlecode.com/files/gmock-1.7.0.zip",
-  sha256 = "26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b",
-  build_file = "gmock.BUILD",
+workspace(name = "com_google_protobuf")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+new_local_repository(
+    name = "submodule_gmock",
+    path = "third_party/googletest",
+    build_file = "@//:third_party/googletest/BUILD.bazel"
+)
+
+http_archive(
+    name = "six_archive",
+    build_file = "@//:six.BUILD",
+    sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
+    urls = ["https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz#md5=34eed507548117b2ab523ab14b2f8b55"],
+)
+
+bind(
+    name = "python_headers",
+    actual = "//util/python:python_headers",
+)
+
+bind(
+    name = "gtest",
+    actual = "@submodule_gmock//:gtest",
 )
 
-new_http_archive(
-  name = "six_archive",
-  url = "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz#md5=34eed507548117b2ab523ab14b2f8b55",
-  sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
-  build_file = "six.BUILD",
+bind(
+    name = "gtest_main",
+    actual = "@submodule_gmock//:gtest_main",
 )
 
 bind(
-  name = "gtest",
-  actual = "@gmock_archive//:gtest",
+    name = "six",
+    actual = "@six_archive//:six",
+)
+
+maven_jar(
+    name = "guava_maven",
+    artifact = "com.google.guava:guava:18.0",
 )
 
 bind(
-  name = "gtest_main",
-  actual = "@gmock_archive//:gtest_main",
+    name = "guava",
+    actual = "@guava_maven//jar",
+)
+
+maven_jar(
+    name = "gson_maven",
+    artifact = "com.google.code.gson:gson:2.7",
 )
 
 bind(
-  name = "six",
-  actual = "@six_archive//:six",
+    name = "gson",
+    actual = "@gson_maven//jar",
 )