diff options
| author | Daniel Norman <danielnorman@google.com> | 2022-03-18 22:42:09 +0000 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2022-03-18 23:00:49 +0000 |
| commit | 2beae2d783418db737b7d5159a6ce76807c15092 (patch) | |
| tree | aa5339897c63e85923418636fa82085e46460d91 | |
| parent | eaffafb39a758be32cc5435b64a865b75ff03208 (diff) | |
| parent | b8ec84ded1e3cead482f9d8bac192a7f9b3ffde8 (diff) | |
| download | redfin-2beae2d783418db737b7d5159a6ce76807c15092.tar.gz | |
[conflict] Remove now-unnecessary merge configs. am: 01b1c623c4 am: 67e0c9cddc am: b8ec84ded1
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2032084
Change-Id: I0db29796bc349cbf6abc910f718ebc726824f65a
| -rw-r--r-- | vf/framework_item_list.txt | 23 | ||||
| -rw-r--r-- | vf/framework_misc_info_keys.txt | 26 | ||||
| -rw-r--r-- | vf/vendor_item_list.txt | 21 |
3 files changed, 0 insertions, 70 deletions
diff --git a/vf/framework_item_list.txt b/vf/framework_item_list.txt deleted file mode 100644 index 81bec4b..0000000 --- a/vf/framework_item_list.txt +++ /dev/null @@ -1,23 +0,0 @@ -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 -IMAGES/vbmeta_system.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/* diff --git a/vf/framework_misc_info_keys.txt b/vf/framework_misc_info_keys.txt deleted file mode 100644 index 0bcc385..0000000 --- a/vf/framework_misc_info_keys.txt +++ /dev/null @@ -1,26 +0,0 @@ -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_disable_sparse -product_fs_type -root_dir -system_disable_sparse -system_ext_disable_sparse -system_ext_fs_type -system_other_disable_sparse diff --git a/vf/vendor_item_list.txt b/vf/vendor_item_list.txt deleted file mode 100644 index a86378c..0000000 --- a/vf/vendor_item_list.txt +++ /dev/null @@ -1,21 +0,0 @@ -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/* |