| Index: third_party/protobuf26/README.chromium
|
| diff --git a/third_party/protobuf26/README.chromium b/third_party/protobuf26/README.chromium
|
| index 9b1292cdfc3f2d16283cac2e346eb66f22da55ce..35df332a8261a1eeb88ef0a7c405be778bf403ee 100644
|
| --- a/third_party/protobuf26/README.chromium
|
| +++ b/third_party/protobuf26/README.chromium
|
| @@ -2,12 +2,12 @@
|
|
|
| sergiyb@: It has been manually renamed to protobuf26. This is needed to avoid
|
| conflicts with a built-in google.protobuf module found on many developer
|
| -machines. The long-term solution to this problem was to use virtualenv and it
|
| -was implemented, but had to be reverted due to incompatibilities with ChromiumOS
|
| -builds (see http://crbug.com/542922).
|
| +machines. The long-term solution to this problem, however, should be virtualenv.
|
| +Unfortunately due to limited time and lack of experience, it was not a
|
| +reasonable short-term solution.
|
|
|
| -If you need to update this package, please make sure that you replace all the
|
| -references to google.protobuf in the package itself with protobuf26, e.g.
|
| +If you need to update this package, please make sure that you replace all
|
| +the references to google.protobuf in the package itself with protobuf26, e.g.
|
|
|
| from google.protobuf import text_format
|
| import google.protobuf
|
| @@ -17,7 +17,4 @@
|
| from protobuf26 import text_format
|
| import protobuf26
|
|
|
| -Original bug tracking setting up virtualenv for depot_tools was
|
| -http://crbug.com/503067, but it was closed as WontFix. If you believe that
|
| -virtualenv should be added to the current version of depot_tools, please re-open
|
| -that bug.
|
| +Bug tracking setting up virtualenv for depot_tools is https://crbug.com/496241.
|
|
|