Index: third_party/cq_client/cq_pb2.py |
diff --git a/third_party/cq_client/cq_pb2.py b/third_party/cq_client/cq_pb2.py |
index 3ea8c6592fb919d8e960266b06c9cd893e9dd4fc..2e2f364b8b214b75e388a0845f45ad4643fda601 100644 |
--- a/third_party/cq_client/cq_pb2.py |
+++ b/third_party/cq_client/cq_pb2.py |
@@ -1,13 +1,21 @@ |
+# This file was originally generated by the protocol buffer compiler 2.6.1, but |
+# was subsequently manually edited to import protobuf26 instead of |
+# google.protobuf to prevent conflicts with a different version of |
+# google.protobuf that some users of depot_tools have installed. If you need to |
+# re-generate this file, please make similar changes again and add this comment |
+# back. More details on why we chose to rename the package can be found in the |
+# file depot_tools/third_party/protobuf26/README.chromium. |
+ |
# Generated by the protocol buffer compiler. DO NOT EDIT! |
# source: cq.proto |
import sys |
_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) |
-from google.protobuf import descriptor as _descriptor |
-from google.protobuf import message as _message |
-from google.protobuf import reflection as _reflection |
-from google.protobuf import symbol_database as _symbol_database |
-from google.protobuf import descriptor_pb2 |
+from protobuf26 import descriptor as _descriptor |
+from protobuf26 import message as _message |
+from protobuf26 import reflection as _reflection |
+from protobuf26 import symbol_database as _symbol_database |
+from protobuf26 import descriptor_pb2 |
# @@protoc_insertion_point(imports) |
_sym_db = _symbol_database.Default() |