diff options
| author | Daniel Norman <danielnorman@google.com> | 2022-03-18 22:29:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-18 22:29:53 +0000 |
| commit | b8ec84ded1e3cead482f9d8bac192a7f9b3ffde8 (patch) | |
| tree | ca5de5810e9eaf2f7f0cf73334bed0d52f9397b6 | |
| parent | 65f21280b2ef2d07a58cf4b48dc970e04b5f1d48 (diff) | |
| parent | 67e0c9cddc62491003404c7d63b4022c415a34fe (diff) | |
| download | redfin-b8ec84ded1e3cead482f9d8bac192a7f9b3ffde8.tar.gz | |
Remove now-unnecessary merge configs. am: 01b1c623c4 am: 67e0c9cddc
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2032084
Change-Id: I6914fd0715d79e933b72ca8c8d4befa4ab8821bb
| -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/* |