Merge "Use ro.debuggable instead of ro.build.type"

am: 37c90df931

* commit '37c90df93111b5ce08720f8c614dd9e946679ac4':
  Use ro.debuggable instead of ro.build.type
This commit is contained in:
Yusuke Sato 2016-02-25 19:34:27 +00:00 committed by android-build-merger
commit 4e30b63fc6

View file

@ -191,9 +191,9 @@ def restore_dropbox(device, original_dropbox_max_files):
def init_perf(device, output, record_list, tags):
device.wait()
build_type = device.get_prop('ro.build.type')
debuggable = device.get_prop('ro.debuggable')
original_dropbox_max_files = None
if build_type != 'user':
if debuggable == '1':
# Workaround for Dropbox issue (http://b/20890386).
original_dropbox_max_files = disable_dropbox(device)