aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2015-08-18 23:25:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-08-18 23:25:50 +0000
commit101156fa214f74e5cb67cc79f8517bd6d1e0cfd8 (patch)
tree1dff9f2b0a018f58aeae40c78da04590ec753682
parentd09b4de6a6b12a313a36b40bb3886a4b3324d957 (diff)
parentcfc706a186ac6b6bb0bfb4ce7abeb87571be4ec6 (diff)
downloadchromium-trace-101156fa214f74e5cb67cc79f8517bd6d1e0cfd8.tar.gz
Merge "Upgrade update.py to catapult repo changes"
-rwxr-xr-xupdate.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/update.py b/update.py
index 770fa6c3..472d6af3 100755
--- a/update.py
+++ b/update.py
@@ -4,10 +4,10 @@ import codecs, httplib, json, optparse, os, urllib, shutil, subprocess, sys
output_html_file = 'systrace_trace_viewer.html'
-upstream_git = 'https://github.com/google/trace-viewer.git'
+upstream_git = 'https://github.com/catapult-project/catapult.git'
script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
-trace_viewer_dir = os.path.join(script_dir, 'trace-viewer')
+trace_viewer_dir = os.path.join(script_dir, 'catapult')
parser = optparse.OptionParser()
parser.add_option('--local', dest='local_dir', metavar='DIR',
@@ -51,10 +51,10 @@ else:
# Generate the vulcanized result.
-build_dir = os.path.join(trace_viewer_dir)
+build_dir = os.path.join(trace_viewer_dir, 'tracing')
sys.path.append(build_dir)
-from tracing.build import vulcanize_trace_viewer
+from tracing_build import vulcanize_trace_viewer
with codecs.open(output_html_file, encoding='utf-8', mode='w') as f:
vulcanize_trace_viewer.WriteTraceViewer(
f,