diff options
| author | Isabelle Taylor <taylori@google.com> | 2019-08-07 10:29:28 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-07 10:29:28 -0700 |
| commit | eaca3fc33c5d7ae15aee00cc976acd5c123b2365 (patch) | |
| tree | d00862cb1a1556c28c10469e6156b9d26ca1b51b /catapult/systrace/profile_chrome | |
| parent | f4e722b911fcc6f7164026432de62a02ea3460fb (diff) | |
| parent | 8e2ec7bab513b1db837e292aadee7caf1a4c395b (diff) | |
| download | chromium-trace-eaca3fc33c5d7ae15aee00cc976acd5c123b2365.tar.gz | |
Merge "Update catapult to latest version (76a241669)" am: 6e5717f80b am: ee01823b5b am: 3328f1104e
am: 8e2ec7bab5
Change-Id: Ia1645886356db3f147ffeef4fac2aecf5d05c232
Diffstat (limited to 'catapult/systrace/profile_chrome')
3 files changed, 2 insertions, 3 deletions
diff --git a/catapult/systrace/profile_chrome/chrome_startup_tracing_agent.py b/catapult/systrace/profile_chrome/chrome_startup_tracing_agent.py index c1456c11..53be30ce 100644 --- a/catapult/systrace/profile_chrome/chrome_startup_tracing_agent.py +++ b/catapult/systrace/profile_chrome/chrome_startup_tracing_agent.py @@ -40,7 +40,7 @@ class ChromeStartupTracingAgent(tracing_agents.TracingAgent): def _SetupTracing(self): # TODO(lizeb): Figure out how to clean up the command-line file when # _TearDownTracing() is not executed in StopTracing(). - flags = ['--trace-startup'] + flags = ['--trace-startup', '--enable-perfetto'] if self._trace_time is not None: flags.append('--trace-startup-duration={}'.format(self._trace_time)) self._flag_changer.AddFlags(flags) diff --git a/catapult/systrace/profile_chrome/perf_tracing_agent.py b/catapult/systrace/profile_chrome/perf_tracing_agent.py index c7ad9468..1414905e 100644 --- a/catapult/systrace/profile_chrome/perf_tracing_agent.py +++ b/catapult/systrace/profile_chrome/perf_tracing_agent.py @@ -26,7 +26,6 @@ try: # pylint: disable=F0401,no-name-in-module,wrong-import-position from telemetry.internal.platform.profiler import android_profiling_helper from telemetry.internal.util import binary_manager - # pylint: enable=wrong-import-position except ImportError: android_profiling_helper = None binary_manager = None diff --git a/catapult/systrace/profile_chrome/profiler_unittest.py b/catapult/systrace/profile_chrome/profiler_unittest.py index 9b35753d..cd7af956 100644 --- a/catapult/systrace/profile_chrome/profiler_unittest.py +++ b/catapult/systrace/profile_chrome/profiler_unittest.py @@ -18,7 +18,7 @@ class ProfilerTest(unittest.TestCase): def setUp(self): ui.EnableTestMode() self._tracing_options = tracing_controller.TracingControllerConfig(None, - None, None, None, None, None, None, None, None) + None, None, None, None, None, None, None, None, None) @decorators.ClientOnlyTest def testCaptureBasicProfile(self): |