diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2019-05-14 15:07:05 -0700 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2019-05-14 15:07:05 -0700 |
commit | 717db51700c0477397867d4ff5370cd194cd7991 (patch) | |
tree | 52292af494d48aeb3de8839657e372a9b2f2e677 | |
parent | 1cf4af7b2c3ef7d4795aed2bda936e8e5c43fd02 (diff) |
Updated protobuf to the main branch again.
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | WORKSPACE | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 24e0b54..2573173 100644 --- 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) @@ -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( |