Update from https://crrev.com/305340
Added a few #includes of base/compiler_specific.h for upstream cleanup.
Changed callers for cc::BeginFrameArgs and cc::RendererSettings API
changes.
Review URL: https://codereview.chromium.org/754433003
diff --git a/build/android/adb_logcat_monitor.py b/build/android/adb_logcat_monitor.py
index a5ae785..d3cc67d 100755
--- a/build/android/adb_logcat_monitor.py
+++ b/build/android/adb_logcat_monitor.py
@@ -83,7 +83,7 @@
stderr=subprocess.PIPE).communicate()
if err:
logging.warning('adb device error %s', err.strip())
- return re.findall('^(\S+)\tdevice$', out, re.MULTILINE)
+ return re.findall('^(\\S+)\tdevice$', out, re.MULTILINE)
except TimeoutException:
logging.warning('"adb devices" command timed out')
return []
@@ -136,7 +136,7 @@
time.sleep(5)
except SigtermError:
logging.info('Received SIGTERM, shutting down')
- except:
+ except: # pylint: disable=bare-except
logging.exception('Unexpected exception in main.')
finally:
for process, _ in devices.itervalues():
