From 46c1a74ef35f66643a75149724f47bd5cec8ea25 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 25 Sep 2020 11:38:26 -0400
Subject: [PATCH] 17.1: Fixup TTS

---
 .../android_build/0001-Restore_TTS.patch      | 59 +++++++++++++++++++
 PrebuiltApps                                  |  2 +-
 Scripts/LineageOS-17.1/Patch.sh               |  2 +-
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 Patches/LineageOS-17.1/android_build/0001-Restore_TTS.patch

diff --git a/Patches/LineageOS-17.1/android_build/0001-Restore_TTS.patch b/Patches/LineageOS-17.1/android_build/0001-Restore_TTS.patch
new file mode 100644
index 00000000..80ce5eb5
--- /dev/null
+++ b/Patches/LineageOS-17.1/android_build/0001-Restore_TTS.patch
@@ -0,0 +1,59 @@
+From 13dca7d2cdaa7e4a3ffc3d5a16c716542fac4e88 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 f3fb8c306..e9f7079c0 100644
+--- a/target/product/full_base.mk
++++ b/target/product/full_base.mk
+@@ -58,6 +58,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 e5771cc94..6d2bc7c8a 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 \
+@@ -58,6 +66,7 @@ PRODUCT_PACKAGES += \
+     MusicFX \
+     OsuLogin \
+     PacProcessor \
++    PicoTts \
+     PrintRecommendationService \
+     PrintSpooler \
+     ProxyHandler \
+-- 
+2.26.2
+
diff --git a/PrebuiltApps b/PrebuiltApps
index 227f7aef..a4fce0e9 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit 227f7aefd4ee1ee71c97f6f2577cc67320632b64
+Subproject commit a4fce0e963a497c6acb5e161842442d2e336810c
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 1a91d729..eeec919c 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -65,7 +65,7 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bio
 if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bionic/0002-Symbol_Ordering.patch"; fi; #(GrapheneOS)
 
 enterAndClear "build/make";
-#git revert --no-edit 271f6ffa045064abcac066e97f2cb53ccb3e5126 61f7ee9386be426fd4eadc2c8759362edb5bef8; #Add back PicoTTS and language files
+patch -p1 < "$DOS_PATCHES/android_build/0001-Restore_TTS.patch"; #Add back PicoTTS and language files
 patch -p1 < "$DOS_PATCHES_COMMON/android_build/0001-OTA_Keys.patch"; #add correct keys to recovery for OTA verification
 awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' core/product.mk;
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk;