Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py |
index a7591c11a4bcc88ca4574df91e191bf3a4ad4f14..c62e0bda19f311dc1be7aef38c30320a1aa4957e 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py |
@@ -172,7 +172,7 @@ class ContentShellDriverDetails(): |
return 'libcontent_shell_content_view.so' |
def additional_resources(self): |
- return ['content_resources.pak', 'content_shell.pak', 'shell_resources.pak'] |
agrieve
2016/04/12 20:36:47
Android shouldn't need these to be side-loaded sin
|
+ return [] |
def command_line_file(self): |
return '/data/local/tmp/content-shell-command-line' |
@@ -940,7 +940,7 @@ class ChromiumAndroidDriver(driver.Driver): |
return [line.split(' ')[0] for line in md5sum_output] |
def _files_match(self, host_file, device_file): |
- assert self._port.host.filesystem.exists(host_file) |
+ assert self._port.host.filesystem.exists(host_file), host_file |
device_hashes = self._extract_hashes_from_md5sum_output( |
self._port.host.executive.popen(self._android_commands.adb_command() + ['shell', MD5SUM_DEVICE_PATH, device_file], |
stdout=subprocess.PIPE).stdout) |