diff options
author | Jakob Buchgraber <buchgr@google.com> | 2018-07-09 16:45:04 +0200 |
---|---|---|
committer | Jakob Buchgraber <buchgr@google.com> | 2018-07-09 16:45:27 +0200 |
commit | 8cc62f781ff4e724f8c2f763487390063fcc79e4 (patch) | |
tree | 8b9ba11f90fa221167a3538295a201839ab30ce2 /third_party/protobuf/README.md | |
parent | ee62862c3dd52634ac5ec722b98b8a0c994e7155 (diff) |
Revert "Update protobuf to 3.6.0. Fixes #5439"
This reverts commit 6fd4e0edd4de22dec9eda13dc0b29214f2ca117e.
Diffstat (limited to 'third_party/protobuf/README.md')
-rw-r--r-- | third_party/protobuf/README.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/protobuf/README.md b/third_party/protobuf/README.md index 10837db9db..68fc1b1bf9 100644 --- a/third_party/protobuf/README.md +++ b/third_party/protobuf/README.md @@ -24,18 +24,18 @@ rm -rf .git .gitignore .gitmodules 4) Copy `third_party/protobuf/<old_proto>/com_google_protobuf_java.BUILD` to the new directory. 5) Copy the `licenses` declaration and the `srcs` filegroup from - `third_party/protobuf/<old_proto>/util/python/BUILD` and - `third_party/protobuf/<old_proto>/examples/BUILD` to the corresponding + `third_party/protobuf/<old_proto>/util/python/BUILD` to the corresponding file in the new directory. -6) Name the `new\_proto` directory according to the protobuf version number. -7) In `third\_party/protobuf/BUILD` update `PROTOBUF\_VERSION` to the name of the +6) For each file listed in `RELATIVE_WELL_KNOWN_PROTOS` in the `new_proto/BUILD` file + copy it from `new_proto/srcs/google/protobuf` to `new_proto/google/protobuf`. +7) Name the `new\_proto` directory according to the protobuf version number. +8) In `third\_party/protobuf/BUILD` update `PROTOBUF\_VERSION` to the name of the directory you just created. -8) In the root `WORKSPACE` file update relative paths of protobuf to point to +9) In the root `WORKSPACE` file update relative paths of protobuf to point to the new version. -9) Update version number in `src/main/protobuf/BUILD` and `src/test/shell/testenv.sh`. 10) Delete the `third_party/protobuf/<old_proto>` directory. 11) Update this file if you found the :instructions to be wrong or incomplete. # Current protobuf version -The current version of protobuf is [3.6.0](https://github.com/google/protobuf/releases/tag/v3.6.0). +The current version of protobuf is [3.4.0](https://github.com/google/protobuf/releases/tag/v3.4.0). |