Skip _oem_props if oem_dicts is None.
The oem_dicts in BuildInfo is only available to ota_from_target_files when it's called with "--oem_settings" input. However, aosp/1135332 starts to use BuildInfo in add_img_to_target_files w/o oem_dicts. An assert is triggered due to it when oem_fingerprint_properties is in the info_dict. This change skips _oem_props reading if oem_dicts is None to allow this case. BUG: 155360923 BUG: 154171021 Test: Sign images with oem_fingerprint_properties. Change-Id: I6a73feecd9567fd4d85f4eab3d4e11c5df28fe39 Merged-In: Idfd41c8b20b23d50e4895f24500f9a25625b7d98
This commit is contained in:
@@ -175,10 +175,6 @@ class BuildInfoTest(test_utils.ReleaseToolsTestCase):
|
||||
self.assertEqual('brand3/product-name/device3:build-thumbprint',
|
||||
target_info.fingerprint)
|
||||
|
||||
# Missing oem_dict should be rejected.
|
||||
self.assertRaises(AssertionError, common.BuildInfo,
|
||||
self.TEST_INFO_DICT_USES_OEM_PROPS, None)
|
||||
|
||||
def test_init_badFingerprint(self):
|
||||
info_dict = copy.deepcopy(self.TEST_INFO_DICT)
|
||||
info_dict['build.prop']['ro.build.fingerprint'] = 'bad fingerprint'
|
||||
|
Reference in New Issue
Block a user