diff options
| author | Daniel Norman <danielnorman@google.com> | 2022-03-18 22:09:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-18 22:09:28 +0000 |
| commit | 67e0c9cddc62491003404c7d63b4022c415a34fe (patch) | |
| tree | 410e614e42c8fbf4fe5968234c9e49ae995a715c | |
| parent | ddef017e447d9462883e33c6dab830d2d57957f6 (diff) | |
| parent | 01b1c623c4d556558b68fab2e3c9b09b21863f98 (diff) | |
| download | redfin-67e0c9cddc62491003404c7d63b4022c415a34fe.tar.gz | |
Remove now-unnecessary merge configs. am: 01b1c623c4
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2032084
Change-Id: I52b739b249a7a58bc96eca810e072f294db35e58
| -rw-r--r-- | vf/framework_item_list.txt | 22 | ||||
| -rw-r--r-- | vf/framework_misc_info_keys.txt | 22 | ||||
| -rw-r--r-- | vf/vendor_item_list.txt | 21 |
3 files changed, 0 insertions, 65 deletions
diff --git a/vf/framework_item_list.txt b/vf/framework_item_list.txt deleted file mode 100644 index 6621c49..0000000 --- a/vf/framework_item_list.txt +++ /dev/null @@ -1,22 +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 -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 00496da..0000000 --- a/vf/framework_misc_info_keys.txt +++ /dev/null @@ -1,22 +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_fs_type -root_dir -system_ext_fs_type 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/* |