Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Unified Diff: tools/telemetry/telemetry/core/chrome/android_browser_finder.py

Issue 22989006: [telemetry] Change many relative paths to use util.Get*Dir(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/core/chrome/android_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
index bf1172ca494fa9bde6faca05cab5160891f09e31..c85d32a22a1fbaa4667ff96d9888ea9b1a370811 100644
--- a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
+++ b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
@@ -12,6 +12,7 @@ import sys
from telemetry.core import browser
from telemetry.core import possible_browser
from telemetry.core import profile_types
+from telemetry.core import util
from telemetry.core.chrome import adb_commands
from telemetry.core.chrome import android_browser_backend
from telemetry.core.platform import android_platform_backend
@@ -91,8 +92,7 @@ def CanFindAvailableBrowsers(logging=real_logging):
logging.warn(' sudo `which adb` devices\n\n')
adb_works = True
except OSError:
- platform_tools_path = os.path.join(
- os.path.dirname(__file__), '..', '..', '..', '..', '..'
+ platform_tools_path = os.path.join(util.GetChromiumSrcDir(),
'third_party', 'android_tools', 'sdk', 'platform-tools')
if (sys.platform.startswith('linux') and
os.path.exists(os.path.join(platform_tools_path, 'adb'))):

Powered by Google App Engine
This is Rietveld 408576698