Revert "Calculate the runtime fingerprint prefixes from build prop"
Revert submission 1297095
Bug: 156131275
Reason for revert: Broken build
Reverted Changes:
I2fe7e93a2:Add a wrapper class PartitionBuildProp
Iac093a40d:Calculate the runtime fingerprint prefixes from bu...
Change-Id: I8b1262c6e94a1db349de39896e56f366c8d64d4c
diff --git a/tools/releasetools/test_ota_from_target_files.py b/tools/releasetools/test_ota_from_target_files.py
index 4077d06..e007863 100644
--- a/tools/releasetools/test_ota_from_target_files.py
+++ b/tools/releasetools/test_ota_from_target_files.py
@@ -26,8 +26,7 @@
GetPackageMetadata, GetTargetFilesZipForSecondaryImages,
GetTargetFilesZipWithoutPostinstallConfig, NonAbOtaPropertyFiles,
Payload, PayloadSigner, POSTINSTALL_CONFIG, PropertyFiles,
- StreamingPropertyFiles, WriteFingerprintAssertion,
- CalculateRuntimeFingerprints)
+ StreamingPropertyFiles, WriteFingerprintAssertion)
def construct_target_files(secondary=False):
@@ -1319,125 +1318,3 @@
Payload.SECONDARY_PAYLOAD_PROPERTIES_TXT):
continue
self.assertEqual(zipfile.ZIP_STORED, entry_info.compress_type)
-
-
-class RuntimeFingerprintTest(test_utils.ReleaseToolsTestCase):
- MISC_INFO = [
- 'recovery_api_version=3',
- 'fstab_version=2',
- 'recovery_as_boot=true',
- ]
-
- BUILD_PROP = [
- 'ro.build.version.release=version-release',
- 'ro.build.id=build-id',
- 'ro.build.version.incremental=version-incremental',
- 'ro.build.type=build-type',
- 'ro.build.tags=build-tags',
- ]
-
- VENDOR_BUILD_PROP = [
- 'ro.product.vendor.brand=vendor-product-brand',
- 'ro.product.vendor.name=vendor-product-name',
- 'ro.product.vendor.device=vendor-product-device'
- ]
-
- def setUp(self):
- common.OPTIONS.oem_dicts = None
- self.test_dir = common.MakeTempDir()
- self.writeFiles({'META/misc_info.txt': '\n'.join(self.MISC_INFO)})
-
- def writeFiles(self, contents_dict):
- for path, content in contents_dict.items():
- abs_path = os.path.join(self.test_dir, path)
- dir_name = os.path.dirname(abs_path)
- if not os.path.exists(dir_name):
- os.makedirs(dir_name)
- with open(abs_path, 'w') as f:
- f.write(content)
-
- @staticmethod
- def constructFingerprint(prefix):
- return '{}:version-release/build-id/version-incremental:' \
- 'build-type/build-tags'.format(prefix)
-
- def test_CalculatePossibleFingerprints_no_dynamic_fingerprint(self):
- build_prop = copy.deepcopy(self.BUILD_PROP)
- build_prop.extend([
- 'ro.product.brand=product-brand',
- 'ro.product.name=product-name',
- 'ro.product.device=product-device',
- ])
- self.writeFiles({
- 'SYSTEM/build.prop': '\n'.join(build_prop),
- 'VENDOR/build.prop': '\n'.join(self.VENDOR_BUILD_PROP),
- })
- common.OPTIONS.info_dict = common.LoadInfoDict(self.test_dir)
-
- self.assertEqual({
- self.constructFingerprint('product-brand/product-name/product-device')
- }, CalculateRuntimeFingerprints())
-
- def test_CalculatePossibleFingerprints_single_override(self):
- vendor_build_prop = copy.deepcopy(self.VENDOR_BUILD_PROP)
- vendor_build_prop.extend([
- 'import /vendor/etc/build_${ro.boot.sku_name}.prop',
- ])
- self.writeFiles({
- 'SYSTEM/build.prop': '\n'.join(self.BUILD_PROP),
- 'VENDOR/build.prop': '\n'.join(vendor_build_prop),
- 'VENDOR/etc/build_std.prop':
- 'ro.product.vendor.name=vendor-product-std',
- 'VENDOR/etc/build_pro.prop':
- 'ro.product.vendor.name=vendor-product-pro',
- })
- common.OPTIONS.info_dict = common.LoadInfoDict(self.test_dir)
- common.OPTIONS.boot_variable_values = {
- 'ro.boot.sku_name': ['std', 'pro']
- }
-
- self.assertEqual({
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-name/vendor-product-device'),
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-std/vendor-product-device'),
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-pro/vendor-product-device'),
- }, CalculateRuntimeFingerprints())
-
- def test_CalculatePossibleFingerprints_multiple_overrides(self):
- vendor_build_prop = copy.deepcopy(self.VENDOR_BUILD_PROP)
- vendor_build_prop.extend([
- 'import /vendor/etc/build_${ro.boot.sku_name}.prop',
- 'import /vendor/etc/build_${ro.boot.device_name}.prop',
- ])
- self.writeFiles({
- 'SYSTEM/build.prop': '\n'.join(self.BUILD_PROP),
- 'VENDOR/build.prop': '\n'.join(vendor_build_prop),
- 'VENDOR/etc/build_std.prop':
- 'ro.product.vendor.name=vendor-product-std',
- 'VENDOR/etc/build_product1.prop':
- 'ro.product.vendor.device=vendor-device-product1',
- 'VENDOR/etc/build_pro.prop':
- 'ro.product.vendor.name=vendor-product-pro',
- 'VENDOR/etc/build_product2.prop':
- 'ro.product.vendor.device=vendor-device-product2',
- })
- common.OPTIONS.info_dict = common.LoadInfoDict(self.test_dir)
- common.OPTIONS.boot_variable_values = {
- 'ro.boot.sku_name': ['std', 'pro'],
- 'ro.boot.device_name': ['product1', 'product2'],
- }
-
- self.assertEqual({
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-name/vendor-product-device'),
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-std/vendor-device-product1'),
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-pro/vendor-device-product1'),
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-std/vendor-device-product2'),
- self.constructFingerprint(
- 'vendor-product-brand/vendor-product-pro/vendor-device-product2'),
- }, CalculateRuntimeFingerprints())