Merge "releasetools: Add sdk and security patch level info to metadata." (993e1d26) · Commits · e / os / android_build

tools/releasetools/ota_from_target_files.py

+4 −0

Original line number	Diff line number	Diff line
		@@ -868,6 +868,10 @@ def GetPackageMetadata(target_info, source_info=None):
		'post-build' : target_info.fingerprint,
		'post-build-incremental' : target_info.GetBuildProp(
		'ro.build.version.incremental'),
		'post-sdk-level' : target_info.GetBuildProp(
		'ro.build.version.sdk'),
		'post-security-patch-level' : target_info.GetBuildProp(
		'ro.build.version.security_patch'),
		}

		if target_info.is_ab:

tools/releasetools/test_ota_from_target_files.py

+18 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ro.product.device' : 'product-device',
		'ro.build.fingerprint' : 'build-fingerprint-target',
		'ro.build.version.incremental' : 'build-version-incremental-target',
		'ro.build.version.sdk' : '27',
		'ro.build.version.security_patch' : '2017-12-01',
		'ro.build.date.utc' : '1500000000',
		},
		}
		@@ -329,6 +331,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ro.product.device' : 'product-device',
		'ro.build.fingerprint' : 'build-fingerprint-source',
		'ro.build.version.incremental' : 'build-version-incremental-source',
		'ro.build.version.sdk' : '25',
		'ro.build.version.security_patch' : '2016-12-01',
		'ro.build.date.utc' : '1400000000',
		},
		}
		@@ -351,6 +355,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ota-required-cache' : '0',
		'post-build' : 'build-fingerprint-target',
		'post-build-incremental' : 'build-version-incremental-target',
		'post-sdk-level' : '27',
		'post-security-patch-level' : '2017-12-01',
		'post-timestamp' : '1500000000',
		'pre-device' : 'product-device',
		},
		@@ -369,6 +375,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ota-required-cache' : '0',
		'post-build' : 'build-fingerprint-target',
		'post-build-incremental' : 'build-version-incremental-target',
		'post-sdk-level' : '27',
		'post-security-patch-level' : '2017-12-01',
		'post-timestamp' : '1500000000',
		'pre-device' : 'product-device',
		'pre-build' : 'build-fingerprint-source',
		@@ -384,6 +392,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ota-type' : 'BLOCK',
		'post-build' : 'build-fingerprint-target',
		'post-build-incremental' : 'build-version-incremental-target',
		'post-sdk-level' : '27',
		'post-security-patch-level' : '2017-12-01',
		'post-timestamp' : '1500000000',
		'pre-device' : 'product-device',
		},
		@@ -399,6 +409,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ota-type' : 'BLOCK',
		'post-build' : 'build-fingerprint-target',
		'post-build-incremental' : 'build-version-incremental-target',
		'post-sdk-level' : '27',
		'post-security-patch-level' : '2017-12-01',
		'post-timestamp' : '1500000000',
		'pre-device' : 'product-device',
		'pre-build' : 'build-fingerprint-source',
		@@ -416,6 +428,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ota-wipe' : 'yes',
		'post-build' : 'build-fingerprint-target',
		'post-build-incremental' : 'build-version-incremental-target',
		'post-sdk-level' : '27',
		'post-security-patch-level' : '2017-12-01',
		'post-timestamp' : '1500000000',
		'pre-device' : 'product-device',
		},
		@@ -459,6 +473,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ota-wipe' : 'yes',
		'post-build' : 'build-fingerprint-target',
		'post-build-incremental' : 'build-version-incremental-target',
		'post-sdk-level' : '27',
		'post-security-patch-level' : '2017-12-01',
		'pre-device' : 'product-device',
		'pre-build' : 'build-fingerprint-source',
		'pre-build-incremental' : 'build-version-incremental-source',
		@@ -481,6 +497,8 @@ class OtaFromTargetFilesTest(unittest.TestCase):
		'ota-type' : 'BLOCK',
		'post-build' : 'build-fingerprint-target',
		'post-build-incremental' : 'build-version-incremental-target',
		'post-sdk-level' : '27',
		'post-security-patch-level' : '2017-12-01',
		'post-timestamp' : '1500000001',
		'pre-device' : 'product-device',
		'pre-build' : 'build-fingerprint-source',