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

Issue 1233643004: Revert of [Android] Remove adb_commands from telemetry. (Reland) (Closed)

Created:
5 years, 5 months ago by alexclarke
Modified:
5 years, 5 months ago
CC:
chromium-reviews, jbudorick+watch_chromium.org, klundberg+watch_chromium.org, telemetry-reviews_chromium.org, yfriedman+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+637 lines, -488 lines) Patch
M build/android/pylib/device/device_utils.py View 1 chunk +16 lines, -0 lines 0 comments Download
M build/android/pylib/screenshot.py View 2 chunks +1 line, -2 lines 0 comments Download
M tools/telemetry/telemetry/core/android_process.py View 2 chunks +2 lines, -9 lines 0 comments Download
A tools/telemetry/telemetry/core/backends/adb_commands.py View 1 chunk +142 lines, -0 lines 0 comments Download
M tools/telemetry/telemetry/core/backends/android_app_backend.py View 2 chunks +4 lines, -4 lines 0 comments Download
M tools/telemetry/telemetry/core/backends/android_command_line_backend.py View 3 chunks +10 lines, -10 lines 0 comments Download
M tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py View 3 chunks +11 lines, -22 lines 0 comments Download
M tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py View 8 chunks +20 lines, -18 lines 0 comments Download
M tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py View 3 chunks +2 lines, -4 lines 0 comments Download
M tools/telemetry/telemetry/core/backends/chrome/android_browser_finder_unittest.py View 3 chunks +21 lines, -27 lines 0 comments Download
M tools/telemetry/telemetry/core/forwarders/android_forwarder.py View 9 chunks +31 lines, -31 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/android_action_runner.py View 7 chunks +9 lines, -9 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/android_device.py View 4 chunks +31 lines, -18 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/android_device_unittest.py View 1 chunk +84 lines, -91 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/android_platform_backend.py View 15 chunks +23 lines, -93 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py View 6 chunks +25 lines, -67 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/android_prebuilt_profiler_helper.py View 1 chunk +1 line, -1 line 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/android_screen_recorder_profiler.py View 1 chunk +1 line, -1 line 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py View 4 chunks +16 lines, -11 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py View 3 chunks +14 lines, -9 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/netlog_profiler.py View 2 chunks +8 lines, -2 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py View 3 chunks +4 lines, -4 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py View 4 chunks +21 lines, -18 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/tcmalloc_heap_profiler.py View 1 chunk +17 lines, -9 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py View 3 chunks +15 lines, -18 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py View 2 chunks +8 lines, -2 lines 0 comments Download
M tools/telemetry/telemetry/core/platform/profiler/vtune_profiler.py View 2 chunks +7 lines, -7 lines 0 comments Download
M tools/telemetry/telemetry/unittest_util/system_stub.py View 2 chunks +93 lines, -1 line 0 comments Download

Messages

Total messages: 5 (2 generated)
alexclarke
Created Revert of [Android] Remove adb_commands from telemetry. (Reland)
5 years, 5 months ago (2015-07-13 10:33:44 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1233643004/1
5 years, 5 months ago (2015-07-13 10:33:51 UTC) #2
commit-bot: I haz the power
5 years, 5 months ago (2015-07-13 10:34:20 UTC) #4
Failed to apply patch for build/android/pylib/device/device_utils.py:
While running git apply --index -3 -p1;
  error: patch failed: build/android/pylib/device/device_utils.py:1382
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: build/android/pylib/device/device_utils.py: patch does not apply

Patch:       build/android/pylib/device/device_utils.py
Index: build/android/pylib/device/device_utils.py
diff --git a/build/android/pylib/device/device_utils.py
b/build/android/pylib/device/device_utils.py
index
299e4cc37f65b0aed8ec5742bc2a2668de632472..c8b471831e62aec343c705afb12bd3095bd8ea24
100644
--- a/build/android/pylib/device/device_utils.py
+++ b/build/android/pylib/device/device_utils.py
@@ -1382,6 +1382,22 @@
           % (property_name, value), str(self))
 
   @decorators.WithTimeoutAndRetriesFromInstance()
+  def GetABI(self, timeout=None, retries=None):
+    """Gets the device main ABI.
+
+    Args:
+      timeout: timeout in seconds
+      retries: number of retries
+
+    Returns:
+      The device's main ABI name.
+
+    Raises:
+      CommandTimeoutError on timeout.
+    """
+    return self.GetProp('ro.product.cpu.abi')
+
+  @decorators.WithTimeoutAndRetriesFromInstance()
   def GetPids(self, process_name, timeout=None, retries=None):
     """Returns the PIDs of processes with the given name.

Powered by Google App Engine
This is Rietveld 408576698