diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/releasetools/common.py | 9 | ||||
| -rw-r--r-- | tools/releasetools/test_common.py | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index df57e3775d..d4c73a49e1 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -360,10 +360,13 @@ class BuildInfo(object): self.oem_dicts = oem_dicts self._is_ab = info_dict.get("ab_update") == "true" - self._oem_props = info_dict.get("oem_fingerprint_properties") - if self._oem_props: - assert oem_dicts, "OEM source required for this build" + # Skip _oem_props if oem_dicts is None to use BuildInfo in + # sign_target_files_apks + if self.oem_dicts: + self._oem_props = info_dict.get("oem_fingerprint_properties") + else: + self._oem_props = None def check_fingerprint(fingerprint): if (" " in fingerprint or any(ord(ch) > 127 for ch in fingerprint)): diff --git a/tools/releasetools/test_common.py b/tools/releasetools/test_common.py index 029d46f07b..173ef53ccd 100644 --- a/tools/releasetools/test_common.py +++ b/tools/releasetools/test_common.py @@ -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' |