From acaaa7b60ea10dafc3fc9f530077e7c254f21cc2 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 15 Nov 2021 20:13:55 +0200 Subject: [PATCH] Remove default skipped files from generate_prop_list_from_image() * This list hasn't been updated in a long time and doesn't contain all the default vendor modules. Simply drop it and regenerate the full list device side automatically with a script. Change-Id: I8cf99d1b726f390f9a3bc2903e69eb26da7ebea9 --- extract_utils.sh | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/extract_utils.sh b/extract_utils.sh index b0dc70e..c8e0755 100644 --- a/extract_utils.sh +++ b/extract_utils.sh @@ -1738,26 +1738,6 @@ function extract_img_data() { fi } -declare -ra VENDOR_SKIP_FILES=( - "bin/toybox_vendor" - "bin/toolbox" - "bin/grep" - "build.prop" - "compatibility_matrix.xml" - "default.prop" - "etc/NOTICE.xml.gz" - "etc/vintf/compatibility_matrix.xml" - "etc/vintf/manifest.xml" - "etc/wifi/wpa_supplicant.conf" - "manifest.xml" - "overlay/DisplayCutoutEmulationCorner/DisplayCutoutEmulationCornerOverlay.apk" - "overlay/DisplayCutoutEmulationDouble/DisplayCutoutEmulationDoubleOverlay.apk" - "overlay/DisplayCutoutEmulationTall/DisplayCutoutEmulationTallOverlay.apk" - "overlay/DisplayCutoutNoCutout/NoCutoutOverlay.apk" - "overlay/framework-res__auto_generated_rro.apk" - "overlay/SysuiDarkTheme/SysuiDarkThemeOverlay.apk" -) - function array_contains() { local element for element in "${@:2}"; do [[ "$element" == "$1" ]] && return 0; done @@ -1778,10 +1758,6 @@ function generate_prop_list_from_image() { if suffix_match_file ".odex" "$FILE" || suffix_match_file ".vdex" "$FILE" ; then continue fi - # Skip VENDOR_SKIP_FILES since it will be re-generated at build time - if array_contains "$FILE" "${VENDOR_SKIP_FILES[@]}"; then - continue - fi # Skip device defined skipped files since they will be re-generated at build time if array_contains "$FILE" "${skipped_vendor_files[@]}"; then continue