18.1: replace PicoTTS with eSpeak-NG

Manifests/Manifest_LAOS-18.1.xml

@@ -66,7 +66,6 @@
 <!-- END OF BRANCH SWITCHING -->
 
 <!-- START OF ADDITIONAL REPOS -->
-	<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
 	<project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" groups="pdk,linux,arm" clone-depth="1" remote="aosp" revision="refs/tags/android-8.1.0_r81" />
 
 	<!-- GrapheneOS -->

Patches/LineageOS-18.1/android_build/0001-Restore_TTS.patch

@@ -1,59 +0,0 @@
-From f8f88297ec49d592e501397222c7ec73d4691657 Mon Sep 17 00:00:00 2001
-From: Tad <tad@spotco.us>
-Date: Fri, 25 Sep 2020 10:13:52 -0400
-Subject: [PATCH] Restore PicoTTS
-
-Reverts:
-271f6ffa045064abcac066e97f2cb53ccb3e5126
-61f7ee9386be426fd4eadc2c8759362edb5bef8d
-
-Change-Id: I9aee2c5f739f9f08a27c71d54570517ed4aa413f
----
- target/product/full_base.mk       | 3 +++
- target/product/handheld_system.mk | 9 +++++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/target/product/full_base.mk b/target/product/full_base.mk
-index 267859a62..8e124c707 100644
---- a/target/product/full_base.mk
-+++ b/target/product/full_base.mk
-@@ -59,6 +59,9 @@ else
- $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage14.mk)
- endif
- 
-+# Get the TTS language packs
-+$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)
-+
- # Get a list of languages.
- $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
- 
-diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
-index f6c92b5e8..176521e09 100644
---- a/target/product/handheld_system.mk
-+++ b/target/product/handheld_system.mk
-@@ -31,6 +31,14 @@ $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk)
- $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
- $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
- 
-+# include available languages for TTS in the system image
-+-include external/svox/pico/lang/PicoLangDeDeInSystem.mk
-+-include external/svox/pico/lang/PicoLangEnGBInSystem.mk
-+-include external/svox/pico/lang/PicoLangEnUsInSystem.mk
-+-include external/svox/pico/lang/PicoLangEsEsInSystem.mk
-+-include external/svox/pico/lang/PicoLangFrFrInSystem.mk
-+-include external/svox/pico/lang/PicoLangItItInSystem.mk
-+
- PRODUCT_PACKAGES += \
-     BasicDreams \
-     BlockedNumberProvider \
-@@ -57,6 +65,7 @@ PRODUCT_PACKAGES += \
-     MtpService \
-     MusicFX \
-     PacProcessor \
-+    PicoTTS \
-     PrintRecommendationService \
-     PrintSpooler \
-     ProxyHandler \
--- 
-2.30.2
-

PrebuiltApps

@@ -1 +1 @@
-Subproject commit e962ca1ce31911d32964e16b1ef16c88a3a05894
+Subproject commit 178f36344e256502ec5d7599503cddd65e634d80

Scripts/LineageOS-18.1/Patch.sh

@@ -61,7 +61,6 @@ enterAndClear "bootable/recovery";
 patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch"; #Abort on serial number specific packages (GrapheneOS)
 
 enterAndClear "build/make";
-patch -p1 < "$DOS_PATCHES/android_build/0001-Restore_TTS.patch"; #Add back PicoTTS and language files
 patch -p1 < "$DOS_PATCHES/android_build/0002-OTA_Keys.patch"; #add correct keys to recovery for OTA verification
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk;
 sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/aosp_product.mk; #Switch to Silence
@@ -74,12 +73,6 @@ echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user b
 enterAndClear "external/chromium-webview";
 git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
 
-enterAndClear "external/svox";
-git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
-sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie
-sed -i 's/about to delete/unable to delete/' pico/src/com/svox/pico/LangPackUninstaller.java;
-awk -i inplace '!/deletePackage/' pico/src/com/svox/pico/LangPackUninstaller.java;
-
 enterAndClear "frameworks/base";
 hardenLocationConf services/core/java/com/android/server/location/gps_debug.conf;
 sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox
@@ -213,6 +206,7 @@ awk -i inplace '!/EtarPrebuilt/' packages.mk; #lineage-17.1 calendar is Etar for
 if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi;
 if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi;
 echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All of our kernels have deny USB patch added
+echo "PRODUCT_PACKAGES += eSpeakNG" >> packages.mk; #PicoTTS needs work to compile on 18.1, use eSpeak-NG instead
 #
 #END OF ROM CHANGES
 #