From 9ff8ca72c54db4bf71553f051da70cabc93c3394 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Thu, 28 Aug 2014 18:29:14 -0500 Subject: [PATCH] Edify: Add abort message for bootloader asserts * If a bootloader assert is not satisfied, print the versions that are supported by the package as well as the version on the device. Change-Id: I958d49281c51bd4e60d596a727bb94cfc4a21909 --- tools/releasetools/edify_generator.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index f8247ee196..3254676eea 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -146,10 +146,13 @@ class EdifyGenerator(object): self.script.append(self.WordWrap(cmd)) def AssertSomeBootloader(self, *bootloaders): - """Asert that the bootloader version is one of *bootloaders.""" + """Assert that the bootloader version is one of *bootloaders.""" cmd = ("assert(" + " ||\0".join(['getprop("ro.bootloader") == "%s"' % (b,) for b in bootloaders]) + + ' || abort("This package supports bootloader(s): ' + + ", ".join(["%s" % (b,) for b in bootloaders]) + + '; this device has bootloader " + getprop("ro.bootloader") + ".");' + ");") self.script.append(self.WordWrap(cmd))