Drop FairEmail, Vanilla, and their AOSP equivalents

Signed-off-by: Tad <tad@spotco.us>

Patches/Common/android_vendor_divested/packages.mk

@@ -7,9 +7,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     EtarPrebuilt \
     FennecDOS \
-    SimpleGallery \
-    FairEmail \
-    VanillaMusic
+    SimpleGallery
+#    FairEmail \
+#    VanillaMusic
 
 ifeq ($(findstring flox,$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \

Scripts/LineageOS-14.1/Patch.sh

@@ -75,6 +75,8 @@ applyPatch "$DOS_PATCHES/android_build/0001-OTA_Keys.patch"; #Add correct keys t
 sed -i '50i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 sed -i '296iLOCAL_AAPT_FLAGS += --auto-add-overlay' core/package_internal.mk;
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk; fi; #Replace the Messaging app with Silence
+awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
+awk -i inplace '!/Exchange2/' target/product/core.mk;
 sed -i 's/2021-06-05/2022-01-05/' core/version_defaults.mk; #Bump Security String #n-asb-2022-01 #XXX
 fi;
 
@@ -298,6 +300,8 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/CM_BUILDTYPE :=
 echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' config/telephony.mk; fi; #Replace the Messaging app with Silence
+awk -i inplace '!/Eleven/' config/common.mk; #Remove Music Player
+awk -i inplace '!/Exchange2/' config/common.mk; #Remove Email
 fi;
 
 if enterAndClear "vendor/cmsdk"; then

Scripts/LineageOS-15.1/Patch.sh

@@ -72,6 +72,7 @@ applyPatch "$DOS_PATCHES/android_build/0001-OTA_Keys.patch"; #Add correct keys t
 applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
 sed -i '57i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence
+awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
 sed -i 's/2021-10-05/2022-01-05/' core/version_defaults.mk; #Bump Security String #O_asb_2022-01 #XXX
 fi;
 
@@ -266,6 +267,8 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
 echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' config/telephony.mk; fi; #Replace the Messaging app with Silence
+awk -i inplace '!/Eleven/' config/common.mk; #Remove Music Player
+awk -i inplace '!/Exchange2/' config/common.mk; #Remove Email
 fi;
 
 if enter "vendor/divested"; then

Scripts/LineageOS-16.0/Patch.sh

@@ -76,6 +76,7 @@ applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv a
 sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence
 sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
+awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
 fi;
 
 if enterAndClear "build/soong"; then
@@ -275,6 +276,8 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
 echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' config/telephony.mk; fi; #Replace the Messaging app with Silence
+awk -i inplace '!/Eleven/' config/common_mobile.mk; #Remove Music Player
+awk -i inplace '!/Exchange2/' config/common_mobile.mk; #Remove Email
 fi;
 
 if enter "vendor/divested"; then

Scripts/LineageOS-17.1/Patch.sh

@@ -280,6 +280,9 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
 echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' config/telephony.mk; fi; #Replace the Messaging app with Silence
+awk -i inplace '!/Eleven/' config/common_mobile.mk; #Remove Music Player
+awk -i inplace '!/Email/' config/common_mobile.mk; #Remove Email
+awk -i inplace '!/Exchange2/' config/common_mobile.mk;
 fi;
 
 if enter "vendor/divested"; then

Scripts/LineageOS-18.1/Patch.sh

@@ -278,6 +278,9 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
 echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' config/telephony.mk; fi; #Replace the Messaging app with Silence
+awk -i inplace '!/Eleven/' config/common_mobile.mk; #Remove Music Player
+awk -i inplace '!/Email/' config/common_mobile.mk; #Remove Email
+awk -i inplace '!/Exchange2/' config/common_mobile.mk;
 fi;
 
 if enter "vendor/divested"; then