commit 2a7aaa69ae1fb1696aa5454459026ac5745fb470
author Xindong Xu <xindong.xu@amlogic.com> Fri Mar 13 15:59:22 2020 +0800
committer Robin Lee <rgl@google.com> Fri Mar 13 14:25:35 2020 +0100
tree 3ef0c29010d3e73ef8fb66b54a4732d9a049a436
parent 1ee63b0b05b7f8b3f693f80c9d86e7754a1f02ec

ota_tool: fix incremental ota error

Problem:
Logical partitions do not update right since commit
f67dd8059d7b746e7dc61812827d7b6a50dc4ac9

    Generate block based OTA for product partitions

due to the wrong order of parameters. This is logged in
/tmp/recovery.log:

    skipping 0 blocks already patched to 202

Bug: 149794632
Change-Id: I92f7a8a226a8a96b892254362d362c515bfb6dc6

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 7a0d994..2126d11 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -631,7 +631,7 @@
     partition_target_info = target_info["fstab"]["/" + name]
     disable_imgdiff = (partition_source_info.fs_type == "squashfs" or
                        partition_target_info.fs_type == "squashfs")
-    return common.BlockDifference(name, partition_src, partition_tgt,
+    return common.BlockDifference(name, partition_tgt, partition_src,
                                   check_first_block,
                                   version=blockimgdiff_version,
                                   disable_imgdiff=disable_imgdiff)