commit 3cba374da2ce3e151f91307479b1a66ebcb081e4
author Tao Bao <tbao@google.com> Tue May 16 16:27:25 2017 -0700
committer Tao Bao <tbao@google.com> Wed May 31 10:20:25 2017 -0700
tree eb4ca9be5bef842920d817de3b6e10144e855d01
parent fe7aeb1de79327682466c4bab58368aaf3374ae2

Pack avbtool into otatools.zip.

Also pack the test keys for easier testing.

Bug: 38315721
Test: m otatools-package and avbtool is present in otatools.zip.
Change-Id: Ieb63bf3f4bc211ef1f48ab278cb01b70845d06da

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 925a523..c022d24 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -491,7 +491,7 @@
 
   # AVB: if enabled, calculate and add hash to boot.img.
   if info_dict.get("board_avb_enable", None) == "true":
-    avbtool = os.getenv('AVBTOOL') or "avbtool"
+    avbtool = os.getenv('AVBTOOL') or OPTIONS.info_dict["avb_avbtool"]
     part_size = info_dict.get("boot_size", None)
     cmd = [avbtool, "add_hash_footer", "--image", img.name,
            "--partition_size", str(part_size), "--partition_name", "boot"]