From 48ae05ea77063931f9d75c9fdf964d11f38dc4c8 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 29 Jun 2017 15:11:44 -0700 Subject: [PATCH] Track the AVB property name change. system_avb_hashtree_enable has been renamed to avb_system_hashtree_enable in commit 3e599ead66fee82837928ed3fb1b46bd7ec13a41. 'care_map.txt' is missing due to the change. Bug: 63142730 Test: `m dist` and check IMAGES/care_map.txt exists in target_files zip. Change-Id: I60c269b41df844b50353d357bf67c20f15548642 (cherry picked from commit 3f72176da0ce367ca6c0110e0be702007eca0822) --- tools/releasetools/add_img_to_target_files.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index aab082b9ed..4a85496aea 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -599,12 +599,12 @@ def AddImagesToTargetFiles(filename): for line in lines: if line.strip() == "system" and ( "system_verity_block_device" in OPTIONS.info_dict or - OPTIONS.info_dict.get("system_avb_hashtree_enable") == "true"): + OPTIONS.info_dict.get("avb_system_hashtree_enable") == "true"): assert os.path.exists(system_img_path) care_map_list += GetCareMap("system", system_img_path) if line.strip() == "vendor" and ( "vendor_verity_block_device" in OPTIONS.info_dict or - OPTIONS.info_dict.get("vendor_avb_hashtree_enable") == "true"): + OPTIONS.info_dict.get("avb_vendor_hashtree_enable") == "true"): assert os.path.exists(vendor_img_path) care_map_list += GetCareMap("vendor", vendor_img_path)