diff options
author | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-11-08 23:03:53 +0000 |
---|---|---|
committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-06 16:36:49 -0700 |
commit | a8d8e49b2efbc031caab7fcc0ca32d08f384240b (patch) | |
tree | c268cee7e5fd06131a8c863538a89d9b818e3ca0 /tools/releasetools/edify_generator.py | |
parent | 7183896361e77cec12942aec3f4e57ae5d03efcc (diff) | |
download | build-a8d8e49b2efbc031caab7fcc0ca32d08f384240b.zip build-a8d8e49b2efbc031caab7fcc0ca32d08f384240b.tar.gz build-a8d8e49b2efbc031caab7fcc0ca32d08f384240b.tar.bz2 |
Remove nulls from the edify generator.
These would break the scripts. WTF are they doing here?
Change-Id: I0c52335a27f7ae974279fde1c2461b2dba24d263
Diffstat (limited to 'tools/releasetools/edify_generator.py')
-rw-r--r-- | tools/releasetools/edify_generator.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 54e9d7e..d754aca 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -118,7 +118,7 @@ class EdifyGenerator(object): def AssertDevice(self, device): """Assert that the device identifier is the given string.""" cmd = ('assert(' + - ' || \0'.join(['getprop("ro.product.device") == "%s" || getprop("ro.build.product") == "%s"' + ' || '.join(['getprop("ro.product.device") == "%s" || getprop("ro.build.product") == "%s"' % (i, i) for i in device.split(",")]) + ' || abort("This package is for device: %s; ' + 'this device is " + getprop("ro.product.device") + ".");' + @@ -128,7 +128,7 @@ class EdifyGenerator(object): def AssertSomeBootloader(self, *bootloaders): """Asert that the bootloader version is one of *bootloaders.""" cmd = ("assert(" + - " ||\0".join(['getprop("ro.bootloader") == "%s"' % (b,) + " || ".join(['getprop("ro.bootloader") == "%s"' % (b,) for b in bootloaders]) + ");") self.script.append(self.WordWrap(cmd)) @@ -136,7 +136,7 @@ class EdifyGenerator(object): def AssertSomeBaseband(self, *basebands): """Assert that the baseband version is one of *basebands.""" cmd = ("assert(" + - " ||\0".join(['getprop("ro.baseband") == "%s"' % (b,) + " || ".join(['getprop("ro.baseband") == "%s"' % (b,) for b in basebands]) + ");") self.script.append(self._WordWrap(cmd)) |