merge_target_files: Checks VINTF metadata of resulting target files
Bug: 139300422
Bug: 131425279
Test: test_merge_target_files
Change-Id: I972db2fc40555ab0fc38316f0a6e6f5e8f163371
diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index a920ffb..fa65767 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -335,6 +335,7 @@
libs: [
"releasetools_add_img_to_target_files",
"releasetools_build_super_image",
+ "releasetools_check_target_files_vintf",
"releasetools_common",
"releasetools_img_from_target_files",
"releasetools_ota_from_target_files",
diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index 916c803..61c4f4e 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -87,6 +87,7 @@
import add_img_to_target_files
import build_super_image
+import check_target_files_vintf
import common
import img_from_target_files
import ota_from_target_files
@@ -906,6 +907,9 @@
vendor_target_files, vendor_item_list, framework_misc_info_keys,
rebuild_recovery)
+ if not check_target_files_vintf.CheckVintf(output_target_files_temp_dir):
+ raise RuntimeError("Incompatible VINTF metadata")
+
generate_images(output_target_files_temp_dir, rebuild_recovery)
generate_super_empty_image(output_target_files_temp_dir, output_super_empty)
