| Index: third_party/protobuf/README.chromium
|
| diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium
|
| index 8838fbc2715f88ba266247fb32e58147b04ad0a0..12d36bf7f1cec839a9d93702518f33b6244542e7 100644
|
| --- a/third_party/protobuf/README.chromium
|
| +++ b/third_party/protobuf/README.chromium
|
| @@ -76,3 +76,10 @@ Description of the patches:
|
| removed in C++11 mode.
|
|
|
| Fixed in https://github.com/google/protobuf/pull/1549
|
| +
|
| +- 0012-extract-globals.patch
|
| +
|
| + Fixes https://crbug.com/700120. Moves empty_string_ into globals.cc so that
|
| + Chromium may build a shared library containing just protobuf globals. Also
|
| + renames it to cr_empty_string_ to not conflict with the system protobuf on
|
| + Linux.
|
|
|