From c648b43cf183302e1a6ad98920747588c3a4fb91 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 29 Jun 2017 16:57:23 -0400
Subject: [PATCH] Fixesg

---
 Manifests/Manifest_LAOS-14.1.xml | 25 +++++++++++++------------
 Scripts/Generic_Deblob.sh        |  3 ++-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 10e935b7..79a5b94a 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -112,35 +112,35 @@
 	<project path="kernel/google/msm" name="LineageOS/android_kernel_google_msm" remote="github" />
 	<project path="packages/apps/SamsungServiceMode" name="LineageOS/android_packages_apps_SamsungServiceMode" remote="github" />
 
-	<!-- Nexus 7 2013 (Flo) -->
+	<!-- Nexus 7 2013 (flo) -->
 	<project path="device/asus/flo" name="LineageOS/android_device_asus_flo" remote="github" />
 
-	<!-- Nexus 4 (Mako) -->
+	<!-- Nexus 4 (mako) -->
 	<project path="device/lge/mako" name="LineageOS/android_device_lge_mako" remote="github" />
 	<project path="kernel/lge/mako" name="LineageOS/lge-kernel-mako" remote="github" />
 
-	<!-- Nexus 5 (Hammerhead) -->
+	<!-- Nexus 5 (hammerhead) -->
 	<project path="device/lge/hammerhead" name="LineageOS/android_device_lge_hammerhead" remote="github" />
 	<project path="kernel/lge/hammerhead" name="LineageOS/android_kernel_lge_hammerhead" remote="github" />
 
-	<!-- Nexus 6 (Shamu) -->
+	<!-- Nexus 6 (shamu) -->
 	<project path="device/moto/shamu" name="LineageOS/android_device_moto_shamu" remote="github" />
 	<project path="kernel/moto/shamu" name="LineageOS/android_kernel_moto_shamu" remote="github" />
 
-	<!-- Nexus 5X (Bullhead) -->
+	<!-- Nexus 5X (bullhead) -->
 	<project path="device/lge/bullhead" name="LineageOS/android_device_lge_bullhead" remote="github" />
 	<project path="kernel/lge/bullhead" name="LineageOS/android_kernel_lge_bullhead" remote="github" />
 
-	<!-- Nexus 6P (Angler) -->
+	<!-- Nexus 6P (angler) -->
 	<project path="device/huawei/angler" name="LineageOS/android_device_huawei_angler" remote="github" />
 	<project path="kernel/huawei/angler" name="LineageOS/android_kernel_huawei_angler" remote="github" />
 
-	<!-- Google Pixel (Marlin/Sailfish) -->
+	<!-- Google Pixel (marlin/sailfish) -->
 	<project path="device/google/marlin" name="LineageOS/android_device_google_marlin" remote="github" />
 	<project path="device/google/sailfish" name="LineageOS/android_device_google_sailfish" remote="github" />
 	<project path="kernel/google/marlin" name="LineageOS/android_kernel_google_marlin" remote="github" />
 
-	<!-- Amazon Kindle Fire HDX 7 3rd Gen (Thor)-->
+	<!-- Amazon Kindle Fire HDX 7 3rd Gen (thor)-->
 	<project path="device/amazon/hdx-common" name="LineageOS/android_device_amazon_hdx-common" remote="github" />
 	<project path="device/amazon/thor" name="LineageOS/android_device_amazon_thor" remote="github" />
 	<project path="kernel/amazon/hdx-common" name="LineageOS/android_kernel_amazon_hdx-common" remote="github" />
@@ -150,17 +150,17 @@
 	<project name="LineageOS/android_device_asus_Z00T" path="device/asus/Z00T" remote="github" />
 	<project name="LineageOS/android_kernel_asus_msm8916" path="kernel/asus/msm8916" remote="github" />
 
-	<!-- LG G3 (VS985) -->
+	<!-- LG G3 (vs985) -->
 	<project path="device/lge/g3-common" name="LineageOS/android_device_lge_g3-common" remote="github" />
 	<project path="device/lge/vs985" name="LineageOS/android_device_lge_vs985" remote="github" />
 	<project path="kernel/lge/g3" name="LineageOS/android_kernel_lge_g3" remote="github" />
 
-	<!-- Moto G 3rd Gen (Osprey) -->
+	<!-- Moto G 3rd Gen (osprey) -->
 	<project path="device/motorola/msm8916-common" name="LineageOS/android_device_motorola_msm8916-common" remote="github" />
 	<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" />
 	<project path="kernel/motorola/msm8916" name="LineageOS/android_kernel_motorola_msm8916" remote="github" />
 
-	<!-- Moto X Pure Edition (XT1575) -->
+	<!-- Moto X Pure Edition (xt1575) -->
 	<project path="device/motorola/clark" name="LineageOS/android_device_motorola_clark" remote="github" />
 	<project path="kernel/motorola/msm8992" name="LineageOS/android_kernel_motorola_msm8992" remote="github" />
 
@@ -168,7 +168,7 @@
 	<project path="device/nextbit/ether" name="LineageOS/android_device_nextbit_ether" remote="github" />
 	<project path="kernel/nextbit/msm8992" name="LineageOS/android_kernel_nextbit_msm8992" remote="github" />
 
-	<!-- OnePlus One (Bacon) -->
+	<!-- OnePlus One (bacon) -->
 	<project path="device/oneplus/bacon" name="LineageOS/android_device_oneplus_bacon" remote="github" />
 	<project path="device/oppo/msm8974-common" name="LineageOS/android_device_oppo_msm8974-common" remote="github" />
 	<project path="kernel/oneplus/msm8974" name="LineageOS/android_kernel_oneplus_msm8974" remote="github" />
@@ -189,6 +189,7 @@
 	<project path="vendor/nextbit" name="TheMuppets/proprietary_vendor_nextbit" remote="github" />
 	<project path="vendor/oneplus" name="TheMuppets/proprietary_vendor_oneplus" remote="github" />
 	<project path="vendor/oppo" name="TheMuppets/proprietary_vendor_oppo" remote="github" />
+	<project path="vendor/samsung" name="TheMuppets/proprietary_vendor_samsung" remote="github" />
 <!-- END OF DEVICE REPOS -->
 
 </manifest>
diff --git a/Scripts/Generic_Deblob.sh b/Scripts/Generic_Deblob.sh
index 6e69b43e..57e42265 100755
--- a/Scripts/Generic_Deblob.sh
+++ b/Scripts/Generic_Deblob.sh
@@ -199,7 +199,7 @@ export base;
 deblobDevice() {
 	devicePath=$1;
 	cd $base$devicePath;
-	if [ "${PWD##*/}" == "flo" ] || [ "${PWD##*/}" == "mako" ]; then #Some devices don't need/like TimeKeep
+	if [ "${PWD##*/}" == "flo" ] || [ "${PWD##*/}" == "mako" ] || [ "${PWD##*/}" == "kona-common" ] || [ "${PWD##*/}" == "n5110" ] || [ "${PWD##*/}" == "smdk4412-common" ]; then #Some devices don't need/like TimeKeep
 		replaceTime="false";
 	fi;
 	if [ -f Android.mk ]; then
@@ -350,6 +350,7 @@ find device -maxdepth 2 -mindepth 2 -type d -exec bash -c 'deblobDevice "$0"' {}
 find vendor -name "*vendor*.mk" -type f -exec bash -c 'deblobVendor "$0"' {} \; #Deblob all makefiles
 deblobVendors; #Deblob entire vendor directory
 rm -rf frameworks/av/drm/mediadrm/plugins/clearkey; #Remove Clearkey
+rm -rf vendor/samsung/nodevice;
 #
 #END OF DEBLOBBING
 #