Adds merge config files for aosp_redfin_vf.

Includes a small merge.sh that calls merge_target_files with the
necessary flags. This allows updating arguments in a presubmit-guarded
manner, rather than in the branch definition file.

Bug: 170683837
Test: device/google/redfin/vf/merge.sh out/dist
      to merge aosp_redfin_vf from S with aosp_redfin from R.
      Boot device.
Change-Id: I8cefeabd7bce678c170b119983fd0b3d54e45390
This commit is contained in:
Daniel Norman
2020-10-13 11:56:02 -07:00
parent ad6c41e9cd
commit afbd01e872
4 changed files with 92 additions and 0 deletions

View File

@@ -0,0 +1,22 @@
IMAGES/product.img
IMAGES/product.map
IMAGES/system_ext.img
IMAGES/system_ext.map
IMAGES/system.img
IMAGES/system.map
IMAGES/system_other.img
IMAGES/userdata.img
META/apexkeys.txt
META/apkcerts.txt
META/filesystem_config.txt
META/postinstall_config.txt
META/product_filesystem_config.txt
META/root_filesystem_config.txt
META/system_ext_filesystem_config.txt
META/system_other_filesystem_config.txt
META/update_engine_config.txt
PRODUCT/*
ROOT/*
SYSTEM/*
SYSTEM_EXT/*
SYSTEM_OTHER/*

View File

@@ -0,0 +1,22 @@
ab_update
avb_product_add_hashtree_footer_args
avb_product_hashtree_enable
avb_system_add_hashtree_footer_args
avb_system_ext_add_hashtree_footer_args
avb_system_ext_hashtree_enable
avb_system_hashtree_enable
avb_system_other_add_hashtree_footer_args
avb_system_other_hashtree_enable
avb_vbmeta_system
avb_vbmeta_system_algorithm
avb_vbmeta_system_args
avb_vbmeta_system_key_path
avb_vbmeta_system_rollback_index_location
building_product_image
building_system_ext_image
building_system_image
building_system_other_image
default_system_dev_certificate
product_fs_type
root_dir
system_ext_fs_type

27
vf/merge.sh Executable file
View File

@@ -0,0 +1,27 @@
#!/bin/bash
# Thin wrapper around merge_target_files to allow flag changes to be made in a
# presubmit-guarded change.
readonly DIST_DIR=$1
readonly VENDOR_DIR=$2
if [[ -z "${DIST_DIR}" ]]; then
echo "error: dist dir argument not set"
exit 1
fi
if [[ -z "${VENDOR_DIR}" ]]; then
echo "error: vendor dir argument not set"
exit 1
fi
out/host/linux-x86/bin/merge_target_files \
--framework-target-files ${DIST_DIR}/aosp_redfin_vf-target_files*.zip \
--vendor-target-files ${VENDOR_DIR}/aosp_redfin-target_files-*.zip \
--framework-item-list device/google/redfin/vf/framework_item_list.txt \
--framework-misc-info-keys device/google/redfin/vf/framework_misc_info_keys.txt \
--vendor-item-list device/google/redfin/vf/vendor_item_list.txt \
--allow-duplicate-apkapex-keys \
--output-target-files ${DIST_DIR}/aosp_redfin_vf_merged-target_files.zip \
--output-img ${DIST_DIR}/aosp_redfin_vf_merged-img.zip \
--output-ota ${DIST_DIR}/aosp_redfin_vf_merged-ota.zip

21
vf/vendor_item_list.txt Normal file
View File

@@ -0,0 +1,21 @@
BOOT/*
DATA/*
IMAGES/boot.img
IMAGES/dtbo.img
IMAGES/vendor_boot.img
IMAGES/vendor.img
IMAGES/vendor.map
META/boot_filesystem_config.txt
META/care_map.pb
META/kernel_configs.txt
META/kernel_version.txt
META/otakeys.txt
META/releasetools.py
META/vendor_boot_filesystem_config.txt
META/vendor_filesystem_config.txt
ODM/*
OTA/android-info.txt
PREBUILT_IMAGES/*
RADIO/*
VENDOR/*
VENDOR_BOOT/*