build: Fix a few mis-merges (b1014fd0) · Commits · e / os / android_build

tools/releasetools/common.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -1771,9 +1771,6 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,

		if full_recovery_image:
		sh = """#!/system/bin/sh
		if [ -f /system/etc/recovery-transform.sh ]; then
		exec sh /system/etc/recovery-transform.sh %(recovery_size)d %(recovery_sha1)s %(boot_size)d %(boot_sha1)s
		fi
		if ! applypatch -c %(type)s:%(device)s:%(size)d:%(sha1)s; then
		applypatch /system/etc/recovery.img %(type)s:%(device)s %(sha1)s %(size)d && log -t recovery "Installing new recovery image: succeeded" \|\| log -t recovery "Installing new recovery image: failed"
		else
		@@ -1785,6 +1782,9 @@ fi
		'size': recovery_img.size}
		else:
		sh = """#!/system/bin/sh
		if [ -f /system/etc/recovery-transform.sh ]; then
		exec sh /system/etc/recovery-transform.sh %(recovery_size)d %(recovery_sha1)s %(boot_size)d %(boot_sha1)s
		fi
		if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(recovery_size)d:%(recovery_sha1)s; then
		applypatch %(bonus_args)s %(boot_type)s:%(boot_device)s:%(boot_size)d:%(boot_sha1)s %(recovery_type)s:%(recovery_device)s %(recovery_sha1)s %(recovery_size)d %(boot_sha1)s:/system/recovery-from-boot.p && log -t recovery "Installing new recovery image: succeeded" \|\| log -t recovery "Installing new recovery image: failed"
		else

+2 −2

Original line number	Diff line number	Diff line
		@@ -133,8 +133,8 @@ class EdifyGenerator(object):
		def AssertDevice(self, device):
		"""Assert that the device identifier is the given string."""
		cmd = ('assert(' +
		' \|\| '.join(['getprop("ro.product.device") == "%s"' % i
		for i in device.split(",")]) +
		' \|\| '.join(['getprop("ro.product.device") == "%s" \|\| getprop("ro.build.product") == "%s"'
		% (i, i) for i in device.split(",")]) +
		' \|\| abort("E%d: This package is for device: %s; ' +
		'this device is " + getprop("ro.product.device") + ".");' +
		');') % (common.ErrorCode.DEVICE_MISMATCH, device)

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ def main(argv):
		continue
		if not image.endswith(".img"):
		continue
		if i == "oem.img":
		if image == "oem.img":
		continue
		common.ZipWrite(
		output_zip, os.path.join(images_path, image), image)