diff options
author | Doug Zongker <dougz@android.com> | 2014-05-09 08:29:05 -0700 |
---|---|---|
committer | Doug Zongker <dougz@android.com> | 2014-05-09 08:29:05 -0700 |
commit | af845256f17c4e26345de5141c31ecd80076592c (patch) | |
tree | 0268e01f7aadf023d6061021bf03d160747df963 /tools/releasetools/edify_generator.py | |
parent | 0cd5ec5b16c02d1d435f550c45e3500899081e12 (diff) | |
download | build-af845256f17c4e26345de5141c31ecd80076592c.zip build-af845256f17c4e26345de5141c31ecd80076592c.tar.gz build-af845256f17c4e26345de5141c31ecd80076592c.tar.bz2 |
assert recovery finger/thumbprints, not system
Block OTAs don't have the system partition mounted and so can't use
file_getprop on the system partition. Make assertions look at the
recovery system finger/thumbprints, which should be the same as the
ones on the system partition (even for sprout devices).
Change-Id: Ie5d329d13beab4b428e37f75da9b9e1b8ceb35bc
Diffstat (limited to 'tools/releasetools/edify_generator.py')
-rw-r--r-- | tools/releasetools/edify_generator.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index f6b30e0..edd702c 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -82,12 +82,11 @@ class EdifyGenerator(object): self.script.append(cmd) def AssertSomeFingerprint(self, *fp): - """Assert that the current system build fingerprint is one of *fp.""" + """Assert that the current recovery build fingerprint is one of *fp.""" if not fp: raise ValueError("must specify some fingerprints") cmd = ( - ' ||\n '.join([('file_getprop("/system/build.prop", ' - '"ro.build.fingerprint") == "%s"') + ' ||\n '.join([('getprop("ro.build.fingerprint") == "%s"') % i for i in fp]) + ' ||\n abort("Package expects build fingerprint of %s; this ' 'device has " + getprop("ro.build.fingerprint") + ".");' @@ -95,12 +94,11 @@ class EdifyGenerator(object): self.script.append(cmd) def AssertSomeThumbprint(self, *fp): - """Assert that the current system build thumbprint is one of *fp.""" + """Assert that the current recovery build thumbprint is one of *fp.""" if not fp: raise ValueError("must specify some thumbprints") cmd = ( - ' ||\n '.join([('file_getprop("/system/build.prop", ' - '"ro.build.thumbprint") == "%s"') + ' ||\n '.join([('getprop(ro.build.thumbprint") == "%s"') % i for i in fp]) + ' ||\n abort("Package expects build thumbprint of %s; this ' 'device has " + getprop("ro.build.thumbprint") + ".");' |