summaryrefslogtreecommitdiffstats
path: root/tools/cygprofile
diff options
context:
space:
mode:
authorzhenw <zhenw@chromium.org>2016-02-11 11:47:47 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-11 19:48:46 +0000
commit5e903500791f38618b69b8258fc6a92124553f97 (patch)
tree80000195ec570748adbfa7c2d22e3339708b000c /tools/cygprofile
parentff189b63ddf9cb58c6a98d7a2fabe384265c5ea0 (diff)
downloadchromium_src-5e903500791f38618b69b8258fc6a92124553f97.zip
chromium_src-5e903500791f38618b69b8258fc6a92124553f97.tar.gz
chromium_src-5e903500791f38618b69b8258fc6a92124553f97.tar.bz2
Use flag_changer in catapult devil.android
This CL updates the dependency on pylib.flag_changer to Catapult's devil.android.flag_changer in Chromium repo. - The previous CL added devil.android.flag_changer in catapult: https://crrev.com/1675773002/ - The next CL will remove pylib.flag_changer. BUG=583785 Review URL: https://codereview.chromium.org/1677313002 Cr-Commit-Position: refs/heads/master@{#374936}
Diffstat (limited to 'tools/cygprofile')
-rw-r--r--tools/cygprofile/profile_android_startup.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/cygprofile/profile_android_startup.py b/tools/cygprofile/profile_android_startup.py
index cae57fe..bfc10b8 100644
--- a/tools/cygprofile/profile_android_startup.py
+++ b/tools/cygprofile/profile_android_startup.py
@@ -17,11 +17,15 @@ import sys
import tempfile
import time
-sys.path.append(os.path.join(sys.path[0], '..', '..', 'build', 'android'))
+sys.path.append(os.path.join(sys.path[0], '..', '..',
+ 'third_party', 'catapult', 'devil'))
from devil.android import device_errors
from devil.android import device_utils
+from devil.android import flag_changer
from devil.android import forwarder
from devil.android.sdk import intent
+
+sys.path.append(os.path.join(sys.path[0], '..', '..', 'build', 'android'))
from pylib import constants
from pylib import flag_changer