tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "vintf_ota_delete" am: bcba1cfdaf am: ee276acce8 am: ba0aefb056

Browse source 
am: 6c29d055e0

Change-Id: I76e34d8cbebdca6652ff8cb5de74ee1d83f45a03
This commit is contained in:
Yifan Hong 2019-08-28 18:44:48 -07:00 committed by android-build-merger
commit 6c540f9af1
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/releasetools/Android.bp
View file

@ -335,6 +335,7 @@ python_binary_host {
libs: [ libs: [
"releasetools_add_img_to_target_files", "releasetools_add_img_to_target_files",
"releasetools_build_super_image", "releasetools_build_super_image",
"releasetools_check_target_files_vintf",
"releasetools_common", "releasetools_common",
"releasetools_img_from_target_files", "releasetools_img_from_target_files",
"releasetools_ota_from_target_files", "releasetools_ota_from_target_files",

4
tools/releasetools/merge_target_files.py
View file

@ -87,6 +87,7 @@ import zipfile
import add_img_to_target_files import add_img_to_target_files
import build_super_image import build_super_image
import check_target_files_vintf
import common import common
import img_from_target_files import img_from_target_files
import ota_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, vendor_target_files, vendor_item_list, framework_misc_info_keys,
rebuild_recovery) 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_images(output_target_files_temp_dir, rebuild_recovery)
generate_super_empty_image(output_target_files_temp_dir, output_super_empty) generate_super_empty_image(output_target_files_temp_dir, output_super_empty)