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

Unified Diff: tools/telemetry/telemetry/core/backends/adb_commands.py

Issue 287513002: [Android] Build android tools as PIE and add a wrapper for ICS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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/backends/adb_commands.py
diff --git a/tools/telemetry/telemetry/core/backends/adb_commands.py b/tools/telemetry/telemetry/core/backends/adb_commands.py
index 9542d373652ee2f43ef7e388e31314705daa0b04..bc33dd8efffd531f464fc465c680a42a3e2998c8 100644
--- a/tools/telemetry/telemetry/core/backends/adb_commands.py
+++ b/tools/telemetry/telemetry/core/backends/adb_commands.py
@@ -113,6 +113,7 @@ def SetupPrebuiltTools(adb):
'forwarder_dist/device_forwarder',
'md5sum_dist/md5sum_bin',
'purge_ashmem',
+ 'run_pie',
]
host_tools = [
@@ -141,7 +142,7 @@ def SetupPrebuiltTools(adb):
platform_name = ('android' if t in device_tools else
platform.GetHostPlatform().GetOSName())
prebuilt_path = support_binaries.FindPath(executable, platform_name)
- if not os.path.exists(prebuilt_path):
+ if not prebuilt_path or not os.path.exists(prebuilt_path):
raise NotImplementedError("""
%s must be checked into cloud storage.
Instructions:
« no previous file with comments | « tools/telemetry/bin/android/run_pie.sha1 ('k') | tools/telemetry/telemetry/core/platform/android_platform_backend.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698