| Index: tools/telemetry/telemetry/internal/backends/mandoline/android.py
|
| diff --git a/mojo/tools/mopy/android.py b/tools/telemetry/telemetry/internal/backends/mandoline/android.py
|
| similarity index 97%
|
| copy from mojo/tools/mopy/android.py
|
| copy to tools/telemetry/telemetry/internal/backends/mandoline/android.py
|
| index 2a886f7c3b604fda88792a45763df69474279739..148bddaeeec4646882d255441100c5d0a5232644 100644
|
| --- a/mojo/tools/mopy/android.py
|
| +++ b/tools/telemetry/telemetry/internal/backends/mandoline/android.py
|
| @@ -2,6 +2,10 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +# TODO(yzshen): Once the dep manager is ready, remove this file and use the one
|
| +# from src/mojo/tools directly.
|
| +
|
| +
|
| import atexit
|
| import logging
|
| import os
|
| @@ -12,9 +16,9 @@ import threading
|
| import time
|
|
|
| from .paths import Paths
|
| +from telemetry.core import util
|
|
|
| -sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),
|
| - '..', '..', '..', 'build', 'android'))
|
| +util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
|
| from pylib import constants
|
| from pylib.device import device_errors
|
| from pylib.device import device_utils
|
| @@ -229,7 +233,7 @@ class AndroidShell(object):
|
|
|
| # Extract map-origin args and add the extras array with commas escaped.
|
| parameters = [a for a in arguments if not a.startswith(MAPPING_PREFIX)]
|
| - parameters = [p.replace(',', '\,') for p in parameters]
|
| + parameters = [p.replace(',', r'\,') for p in parameters]
|
| cmd += ['--esa', '%s.extras' % self.target_package, ','.join(parameters)]
|
|
|
| atexit.register(self.kill)
|
|
|