diff options
| author | Yifan Hong <elsk@google.com> | 2019-08-28 17:21:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-28 17:21:36 -0700 |
| commit | ee276acce859bae1335861f378cbc646407c32cf (patch) | |
| tree | b82515b894da45e6e4c039e98f8aa7419be20e16 | |
| parent | a592de9c61fd37faac251549841f320d4bccb10a (diff) | |
| parent | bcba1cfdaf1f0c79f7d42ea1feece753fc657a28 (diff) | |
| download | build-ee276acce859bae1335861f378cbc646407c32cf.tar.gz | |
Merge changes from topic "vintf_ota_delete"
am: bcba1cfdaf
Change-Id: If11df7c409b9d1087defc119bf3a132f5b7016c5
| -rw-r--r-- | tools/releasetools/Android.bp | 1 | ||||
| -rwxr-xr-x | tools/releasetools/merge_target_files.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp index e9aeed1bf0..2bcc6be4f8 100644 --- a/tools/releasetools/Android.bp +++ b/tools/releasetools/Android.bp @@ -335,6 +335,7 @@ python_binary_host { 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 916c803744..61c4f4ecc9 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -87,6 +87,7 @@ import zipfile 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 @@ def merge_target_files(temp_dir, framework_target_files, framework_item_list, 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) |