From 636b09403e28970e16f3b26f8d85a5f3a7f24942 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Tue, 2 May 2017 19:07:26 -0400
Subject: [PATCH] Tweaks

---
 Scripts/Generic_Deblob.sh    | 6 +++---
 Scripts/LAOS-14.1_Patches.sh | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Scripts/Generic_Deblob.sh b/Scripts/Generic_Deblob.sh
index 0cadfa54..eb0156a6 100755
--- a/Scripts/Generic_Deblob.sh
+++ b/Scripts/Generic_Deblob.sh
@@ -197,11 +197,11 @@ deblobDevice() {
 		sed -i 's/property_set("persist.rcs.supported", ".");/property_set("persist.rcs.supported", "1");/' init/init_*.cpp;
 	fi;
 	rm -f rootdir/etc/init.qti.ims.sh #Remove IMS startup script
-	#rm -rf telephony/ims; #Remove IMS
+	#rm -rf telephony/ims; #Remove ims-common
 	rm -rf IMSEnabler; #Remove IMS compatibility module
 	rm -rf data-ipa-cfg-mgr; #Remove IPACM
 	rm -rf libshimwvm; #Remove Google Widevine compatibility module
-	if [ -f setup-makefiles.sh ]; then
+	if [ -f setup-makefiles.sh ]; then #FIXME: This breaks some devices using shared device trees (eg. osprey) when removing blobs that are listed in Android.mk of vendor repositories
 		awk -i inplace '!/'$blobs'/' *proprietary*.txt; #Remove all blob references from blob manifest
 		sh -c "cd $base$devicePath && ./setup-makefiles.sh"; #Update the makefiles
 	fi;
@@ -232,7 +232,7 @@ echo "vendor/lib/libcneapiclient.so" >> device/oneplus/bacon/proprietary-files-q
 find device -maxdepth 2 -mindepth 2 -type d -exec bash -c 'deblobDevice "$0"' {} \; #Deblob all device directories
 find vendor -name "*vendor*.mk" -type f -exec bash -c 'deblobVendor "$0"' {} \; #Deblob all makefiles
 deblobVendors; #Deblob entire vendor directory
-#rm -rf vendor/codeaurora/telephony/ims; #Remove IMS
+#rm -rf vendor/codeaurora/telephony/ims; #Remove ims-common
 rm -rf frameworks/av/drm/mediadrm/plugins/clearkey; #Remove Clearkey
 #
 #END OF DEBLOBBING
diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh
index 4b737c31..17fc78d8 100755
--- a/Scripts/LAOS-14.1_Patches.sh
+++ b/Scripts/LAOS-14.1_Patches.sh
@@ -8,10 +8,8 @@
 #Prepare a build
 #repo sync -j24 --force-sync && sh ../../Scripts/LAOS-14.1_Patches.sh && source ../../Scripts/Generic_Deblob.sh && source build/envsetup.sh && export ANDROID_HOME="/home/tad/Android/SDK" && export JACK_SERVER_VM_ARGUMENTS="-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Xmx4096m" && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys
 
-#Generate a signed userdebug build with root
-#export WITH_SU=true && brunch clark && brunch bacon && brunch mako
 #Generate a signed user build
-#brunch lineage_clark-user && brunch lineage_bacon-user && brunch lineage_mako-user
+#brunch lineage_clark-user && brunch lineage_bacon-user && brunch lineage_mako-user && brunch lineage_hammerhead-user && brunch lineage_shamu-user && brunch lineage_bullhead-user && brunch lineage_angler-user && brunch lineage_flo-user && brunch lineage_marlin-user
 
 #
 #START OF PREPRATION
@@ -25,7 +23,7 @@ ANDROID_HOME="/home/tad/Android/SDK"
 mkdir -p /tmp/ar
 cd /tmp/ar
 wget https://spotco.us/hosts -N #XXX: Hosts is built from non-commercial use files, switch to /hsc for release
-wget https://github.com/Ranks/emojione/raw/master/assets/fonts/emojione-android.ttf -N #XXX: Requires attribuition
+wget https://github.com/Ranks/emojione/raw/master/extras/fonts/emojione-android.ttf -N #XXX: Requires attribuition
 
 #Accept all SDK licences, not normally needed but Gradle managed apps fail without it
 mkdir -p "$ANDROID_HOME/licenses"