diff options
| author | perezju <perezju@chromium.org> | 2014-12-11 08:06:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-11 16:06:34 +0000 |
| commit | a485981c9e60877f4a7435c3726eb19149b52589 (patch) | |
| tree | af602a498d57d154f2a22b084864631601dda9fc /build/android/tombstones.py | |
| parent | 08015b4ab590805ef75607a98f52004c574c9143 (diff) | |
| download | chromium_src-a485981c9e60877f4a7435c3726eb19149b52589.zip chromium_src-a485981c9e60877f4a7435c3726eb19149b52589.tar.gz chromium_src-a485981c9e60877f4a7435c3726eb19149b52589.tar.bz2 | |
Revert of Reland of Migrate DeviceUtils.ReadFile to adb_wrapper (patchset #3 id:40001 of https://codereview.chromium.org/794583004/)
Reason for revert:
Broke again android perf bots and nexus 7 debug with error:
CRITICAL:root:Cannot set Chrome command line. Fix this by flashing to a userdebug build.
Original issue's description:
> Reland of Migrate DeviceUtils.ReadFile to adb_wrapper
>
> Original description:
>
> The implementation is based on a simple 'cat' run by shell on the
> device (with optional as_root).
>
> Interface changes:
> - The return value is a string (instead of a list of lines).
> - An exception is raised if the file cannot be read
> (instead of returning an empty list).
>
> Original CL: https://codereview.chromium.org/775333002/
>
> BUG=267773
>
> Committed: https://crrev.com/a8d3b82a9c779568ee64ec5c261c6c7024ef8759
> Cr-Commit-Position: refs/heads/master@{#307881}
TBR=jbudorick@chromium.org,skyostil@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=267773
Review URL: https://codereview.chromium.org/796013004
Cr-Commit-Position: refs/heads/master@{#307904}
Diffstat (limited to 'build/android/tombstones.py')
| -rwxr-xr-x | build/android/tombstones.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/android/tombstones.py b/build/android/tombstones.py index 94f76f1..fd060ad 100755 --- a/build/android/tombstones.py +++ b/build/android/tombstones.py @@ -63,8 +63,7 @@ def _GetTombstoneData(device, tombstone_file): Returns: A list of lines """ - return device.ReadFile( - '/data/tombstones/' + tombstone_file, as_root=True).splitlines() + return device.ReadFile('/data/tombstones/' + tombstone_file, as_root=True) def _EraseTombstone(device, tombstone_file): |