Merge "Fix system-as-root detection on Pi" am: 60d31dd2f3 am: 0dc3de8f00

am: 804e2edc32

Change-Id: I93de9ffe3bb427533865e0d1733068661a0d209f
This commit is contained in:
SzuWei Lin
2018-02-26 09:06:30 +00:00
committed by android-build-merger

View File

@@ -64,7 +64,7 @@ class ImageMounter(base_mounter.BaseMounter):
"""Provides a file accessor which can access files in the given image file."""
DETECT_SYSTEM_AS_ROOT = 'detect-system-as-root'
_SYSTEM_FILES = ['compatibility_matrix.xml', 'build.prop', 'manifest.xml']
_SYSTEM_FILES = ['compatibility_matrix.xml', 'build.prop']
def __init__(self, image_filename, path_prefix):
super(ImageMounter, self).__init__()