diff options
Diffstat (limited to 'chromium/third_party/catapult/tracing/tracing_project.py')
| -rw-r--r-- | chromium/third_party/catapult/tracing/tracing_project.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/third_party/catapult/tracing/tracing_project.py b/chromium/third_party/catapult/tracing/tracing_project.py index ce198ce7bd3..85c29bd32ac 100644 --- a/chromium/third_party/catapult/tracing/tracing_project.py +++ b/chromium/third_party/catapult/tracing/tracing_project.py @@ -25,7 +25,7 @@ def GetDependencyPaths(): p.catapult_path, p.py_vulcanize_path, p.vinn_path, - p.protobuf_path, + p.protobuf_py3_path if sys.version_info[0] >= 3 else p.protobuf_path, os.path.join(p.catapult_third_party_path, 'WebOb'), os.path.join(p.catapult_third_party_path, 'Paste'), os.path.join(p.catapult_third_party_path, 'six'), @@ -82,6 +82,8 @@ class TracingProject(object): # the gae_ts_mon protobuf lib for its tests, so let's do the same for tracing. protobuf_path = os.path.join( catapult_third_party_path, 'gae_ts_mon', 'gae_ts_mon', 'protobuf') + protobuf_py3_path = os.path.join( + catapult_third_party_path, 'gae_ts_mon', 'gae_ts_mon', 'protobuf-3.20.0') tracing_third_party_path = os.path.join(tracing_root_path, 'third_party') py_vulcanize_path = os.path.join(common_root_path, 'py_vulcanize') @@ -136,7 +138,7 @@ class TracingProject(object): self.source_paths.append(self.oboe_path) def CreateVulcanizer(self): - from py_vulcanize import project as project_module + from py_vulcanize import project as project_module # pylint: disable=import-outside-toplevel return project_module.Project(self.source_paths) def IsD8CompatibleFile(self, filename): @@ -214,4 +216,3 @@ class TracingProject(object): def GetModuleNameForConfigName(self, config_name): return 'tracing.ui.extras.%s_config' % config_name - |