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

Unified Diff: devil/devil/android/device_utils.py

Issue 2275253002: Add a workaround to work with dalvik running on x86 (Closed) Base URL: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git@master
Patch Set: allow KITKAT_WATCH too Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: devil/devil/android/device_utils.py
diff --git a/devil/devil/android/device_utils.py b/devil/devil/android/device_utils.py
index 93aaaf92ecb5d46be7f2151b8ab2f9d981c4dc20..1a996500fd46bf68a0bb876eab893ee09b53b780 100644
--- a/devil/devil/android/device_utils.py
+++ b/devil/devil/android/device_utils.py
@@ -489,6 +489,12 @@ class DeviceUtils(object):
apks = []
for line in output:
if not line.startswith('package:'):
+ # KitKat on x86 may show following warnings that is safe to ignore.
+ if (line.startswith('WARNING: linker: libdvm.so has text relocations.')
+ and version_codes.KITKAT <= self.build_version_sdk
+ and self.build_version_sdk <= version_codes.KITKAT_WATCH
+ and self.product_cpu_abi == 'x86'):
+ continue
raise device_errors.CommandFailedError(
'pm path returned: %r' % '\n'.join(output), str(self))
apks.append(line[len('package:'):])
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698