commit c45161536f4f2aad66126d81481cc5ab7ad46f38
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 07 23:28:30 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 07 23:28:30 2017 +0000
tree 0d00a4abb20f713e1b5e1b47eb1abaf12ff2a724
parent c86c8502acbe731d84dc4de86a68072c7503cfcb
parent 3f72176da0ce367ca6c0110e0be702007eca0822

Merge "Track the AVB property name change."

tools/releasetools/add_img_to_target_files.py

diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 23c179f..4ff4213 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -602,12 +602,12 @@
     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)