commit f2e846fb91d8e07f99c6de3a4a1f8c0892636294
author Kelvin Zhang <zhangkelvin@google.com> Mon Jun 29 16:04:51 2020 -0400
committer Kelvin Zhang <zhangkelvin@google.com> Mon Jul 06 15:13:11 2020 -0400
tree 560e53501cc35ee1774369fc5dfa8d359ffe58b9
parent 8add8cb1459446c1ae7a33bc764bbc49efdd4f32

Check for duplicate entries in build.prop in validation script

Test: Added Unit test
Bug: 143013566
Change-Id: Ida14507a4a6034990bc81d5263ef1cea34f589c1

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 93e14e5..bc6eb24 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -703,7 +703,7 @@
     for partition in PARTITIONS_WITH_CARE_MAP:
       fingerprint = build_info.GetPartitionFingerprint(partition)
       if fingerprint:
-        d["avb_{}_salt".format(partition)] = sha256(fingerprint).hexdigest()
+        d["avb_{}_salt".format(partition)] = sha256(fingerprint.encode()).hexdigest()
 
   return d