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

Unified Diff: tools/telemetry/telemetry/core/platform/android_platform_backend.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
« no previous file with comments | « tools/telemetry/telemetry/core/backends/adb_commands.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/platform/android_platform_backend.py
diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
index 71317cb03fb888a5d2899ae1e4c3427a4af57682..a0e2642300bb830f32d885b9c6e3976c5cec26e2 100644
--- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py
+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
@@ -127,11 +127,11 @@ class AndroidPlatformBackend(
if not android_prebuilt_profiler_helper.InstallOnDevice(
self._device, 'purge_ashmem'):
raise Exception('Error installing purge_ashmem.')
- if self._device.old_interface.RunShellCommand(
+ (status, output) = self._device.old_interface.GetAndroidToolStatusAndOutput(
android_prebuilt_profiler_helper.GetDevicePath('purge_ashmem'),
- log_result=True):
- return
- raise Exception('Error while purging ashmem.')
+ log_result=True)
+ if status != 0:
+ raise Exception('Error while purging ashmem: ' + '\n'.join(output))
def GetMemoryStats(self, pid):
memory_usage = self._device.old_interface.GetMemoryUsageForPid(pid)
« no previous file with comments | « tools/telemetry/telemetry/core/backends/adb_commands.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698