systrace: add support for using a trace fileandroid-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-dev

Change-Id: I58f210f3f67a2de92b93829856c9a969906946c3

1 files changed, 7 insertions, 1 deletions

diff --git a/systrace.py b/systrace.py
index ddc6d3e6..87905fc3 100755
--- a/systrace.py
+++ b/systrace.py
@@ -67,6 +67,8 @@ def main():
   parser.add_option('--link-assets', dest='link_assets', default=False,
                     action='store_true', help='link to original CSS or JS resources '
                     'instead of embedding them')
+  parser.add_option('--from-file', dest='from_file', action='store',
+                    help='read the trace from a file rather than running a live trace')
   parser.add_option('--asset-dir', dest='asset_dir', default='trace-viewer',
                     type='string', help='')
   parser.add_option('-e', '--serial', dest='device_serial', type='string',
@@ -122,6 +124,9 @@ def main():
     else:
       parser.error('the trace buffer size must be a positive number')
 
+  if options.from_file is not None:
+    atrace_args = ['cat', options.from_file]
+
   script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
 
   if options.link_assets:
@@ -154,7 +159,8 @@ def main():
       sys.stderr.flush()
     if adb.stdout in ready[0]:
       out = leftovers + os.read(adb.stdout.fileno(), 4096)
-      out = out.replace('\r\n', '\n')
+      if options.from_file is None:
+        out = out.replace('\r\n', '\n')
       if out.endswith('\r'):
         out = out[:-1]
         leftovers = '\r'