Updated protobuf to the main branch again.

6 years ago · 717db51700
parent 1cf4af7b2c
commit 717db51700
2 changed files with 5 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -114,6 +114,7 @@ add_library(upb_pb
 target_link_libraries(upb_pb
  descriptor_upbproto
  handlers
+  reflection
  table
  upb)
 add_library(upb_json
@ -134,6 +135,7 @@ add_library(upb_test
  tests/test_util.h
  tests/upb_test.h)
 target_link_libraries(upb_test
-  handlers)
+  handlers
+  upb)


--- a/6
+++ b/6
@ -21,10 +21,8 @@ http_archive(

 git_repository(
    name = "com_google_protobuf",
-    commit = "c659a4a4db2e27463e51c732df25730973956be2",
-    #remote = "https://github.com/protocolbuffers/protobuf.git",
-    #commit = "78ca77ac8799f67fda7b9a01cc691cd9fe526f25",
-    remote = "https://github.com/haberman/protobuf.git",
+    remote = "https://github.com/protocolbuffers/protobuf.git",
+    commit = "d41002663fd04325ead28439dfd5ce2822b0d6fb",
 )

 http_archive(