From f88e0ce01d4c9bf4751aec277437981ea4239f42 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 18 Mar 2019 14:01:38 -0700 Subject: [PATCH] releasetools: Kill the use of os.getenv('AVBTOOL'). OTA tools should pick up the avbtool, as listed in dict['avb_avbtool'], from the current PATH (plus bin/ under the dir specified via `--path`), the same way as handling all other host tools. Test: `m dist` Change-Id: I3eb4d2c61979b03d9c23b2403d9a38cf052d87ea --- tools/releasetools/add_img_to_target_files.py | 4 ++-- tools/releasetools/build_image.py | 4 +++- tools/releasetools/common.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index 5132ae742..46dd41666 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -260,7 +260,7 @@ def AddDtbo(output_zip): # AVB-sign the image as needed. if OPTIONS.info_dict.get("avb_enable") == "true": - avbtool = os.getenv('AVBTOOL') or OPTIONS.info_dict["avb_avbtool"] + avbtool = OPTIONS.info_dict["avb_avbtool"] part_size = OPTIONS.info_dict["dtbo_size"] # The AVB hash footer will be replaced if already present. cmd = [avbtool, "add_hash_footer", "--image", img.name, @@ -428,7 +428,7 @@ def AddVBMeta(output_zip, partitions, name, needed_partitions): logger.info("%s.img already exists; not rebuilding...", name) return img.name - avbtool = os.getenv('AVBTOOL') or OPTIONS.info_dict["avb_avbtool"] + avbtool = OPTIONS.info_dict["avb_avbtool"] cmd = [avbtool, "make_vbmeta_image", "--output", img.name] common.AppendAVBSigningArgs(cmd, name) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 5e3d68a8e..bcbc921c8 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -739,6 +739,7 @@ def SaveGlobalDict(filename, glob_dict): with open(filename, "w") as f: f.writelines(["%s=%s" % (key, value) for (key, value) in glob_dict.items()]) + def ExtractSystemOtherAvbKey(in_dir, glob_dict): if glob_dict.get("avb_system_extract_system_other_key") != "true": return @@ -754,12 +755,13 @@ def ExtractSystemOtherAvbKey(in_dir, glob_dict): # Extracts the public key used to sign system_other.img, into system.img: # /system/etc/security/avb/system_other.avbpubkey. - avbtool = os.getenv('AVBTOOL') or glob_dict.get("avb_avbtool") + avbtool = glob_dict.get("avb_avbtool") extract_from = glob_dict.get("avb_system_other_key_path") cmd = [avbtool, "extract_public_key", "--key", extract_from, "--output", extract_to] common.RunAndCheckOutput(cmd, verbose=False) + def main(argv): if len(argv) < 4 or len(argv) > 5: print(__doc__) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index e71667ba2..780b9c155 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -704,7 +704,7 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None, # AVB: if enabled, calculate and add hash to boot.img or recovery.img. if info_dict.get("avb_enable") == "true": - avbtool = os.getenv('AVBTOOL') or info_dict["avb_avbtool"] + avbtool = info_dict["avb_avbtool"] part_size = info_dict[partition_name + "_size"] cmd = [avbtool, "add_hash_footer", "--image", img.name, "--partition_size", str(part_size), "--partition_name",