Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: third_party/dom_distiller_js/protoc_plugins/util/plugin_protos.py

Issue 2250333002: Use non-system protobuf in third_party/dom_distiller_js/protoc_plugins (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add six Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/dom_distiller_js/protoc_plugins/json_values_converter.bat ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/dom_distiller_js/protoc_plugins/util/plugin_protos.py
diff --git a/third_party/dom_distiller_js/protoc_plugins/util/plugin_protos.py b/third_party/dom_distiller_js/protoc_plugins/util/plugin_protos.py
index 57de59fa4396951b353f4e70573a707aa9e60f1d..71d1b59cb339cd93b3534cf4a65ca739e72b9bc6 100644
--- a/third_party/dom_distiller_js/protoc_plugins/util/plugin_protos.py
+++ b/third_party/dom_distiller_js/protoc_plugins/util/plugin_protos.py
@@ -12,14 +12,20 @@ and https://developers.google.com/protocol-buffers/docs/reference/cpp/google.pro
import os
import sys
+SCRIPT_DIR = os.path.dirname(__file__)
+SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, '..', '..', '..', '..'))
+
+sys.path.insert(
+ 1, os.path.join(SRC_DIR, 'third_party', 'protobuf', 'python'))
+sys.path.insert(
+ 1, os.path.join(SRC_DIR, 'third_party', 'protobuf', 'third_party', 'six'))
from google.protobuf.descriptor_pb2 import FieldDescriptorProto
import plugin
import types
sys.path.insert(
- 1, os.path.join(os.path.dirname(__file__), '..', '..',
- 'dist', 'python'))
+ 1, os.path.join(SRC_DIR, 'third_party', 'dom_distiller_js', 'dist', 'python'))
import plugin_pb2
« no previous file with comments | « third_party/dom_distiller_js/protoc_plugins/json_values_converter.bat ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698