setup-makefiles.sh fixes

Manifests/Manifest_LAOS-14.1.xml

@@ -11,10 +11,7 @@
 	<remove-project name="device/sample" />
 	<remove-project name="LineageOS/android_external_ant-wireless_ant_native" />
 	<remove-project name="LineageOS/android_external_ant-wireless_ant_service" />
-	<remove-project name="LineageOS/android_external_htop" />
-	<remove-project name="LineageOS/android_external_powertop" />
 	<remove-project name="LineageOS/android_external_unrar" />
-	<remove-project name="LineageOS/android_external_vim" />
 	<remove-project name="LineageOS/android_hardware_intel_common_libmix" />
 	<remove-project name="LineageOS/android_hardware_intel_common_libva" />
 	<remove-project name="LineageOS/android_hardware_intel_common_libwsbm" />
@@ -36,12 +33,10 @@
 	<remove-project name="LineageOS/android_packages_apps_YahooWeatherProvider" />
 	<remove-project name="LineageOS/android_packages_providers_PartnerBookmarksProvider" />
 	<remove-project name="LineageOS/android_packages_providers_TvProvider" />
-	<remove-project name="LineageOS/android_packages_providers_WeatherProvider" />
 	<remove-project name="LineageOS/android_packages_screensavers_Basic" />
 	<remove-project name="LineageOS/android_packages_screensavers_PhotoTable" />
 	<remove-project name="LineageOS/android_packages_screensavers_WebView" />
 	<remove-project name="LineageOS/android_packages_services_Car" />
-	<remove-project name="LineageOS/android_packages_services_WeatherService" />
 	<remove-project name="LineageOS/android_packages_themes_HexoLibre" />
 	<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />
 	<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" />

Patches/LineageOS-14.1/android_device_lge_mako/0002-Fix_TZ_Path.patch

@@ -0,0 +1,41 @@
+From bf7f848e0817004401db6b450e6172ca2d39c29e Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Sun, 2 Jul 2017 18:30:52 -0400
+Subject: [PATCH] Fix TZ path
+
+Change-Id: I072a9f1468eae67e898a4cad4c717d052aa36589
+---
+ proprietary-blobs.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
+index 44884fa..c099ca5 100644
+--- a/proprietary-blobs.txt
++++ b/proprietary-blobs.txt
+@@ -23,11 +23,6 @@ bin/usbhub
+ bin/usbhub_init
+ bin/v4l2-qcamera-app
+ etc/DxHDCP.cfg
+-etc/firmware/tzapps.b00
+-etc/firmware/tzapps.b01
+-etc/firmware/tzapps.b02
+-etc/firmware/tzapps.b03
+-etc/firmware/tzapps.mdt
+ etc/firmware/vidc_1080p.fw
+ etc/firmware/vidc.b00
+ etc/firmware/vidc.b01
+@@ -149,6 +144,11 @@ vendor/firmware/q6.b04
+ vendor/firmware/q6.b05
+ vendor/firmware/q6.b06
+ vendor/firmware/q6.mdt
++vendor/firmware/tzapps.b00
++vendor/firmware/tzapps.b01
++vendor/firmware/tzapps.b02
++vendor/firmware/tzapps.b03
++vendor/firmware/tzapps.mdt
+ vendor/firmware/wcnss.b00
+ vendor/firmware/wcnss.b01
+ vendor/firmware/wcnss.b02
+-- 
+2.13.2
+

Patches/LineageOS-14.1/android_device_oneplus_bacon/0001-Fix_Adreno_Blobs.patch

@@ -0,0 +1,37 @@
+From 5014507023494ab87345ff36ef4f8d7f4d2d39f5 Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Sun, 2 Jul 2017 18:32:16 -0400
+Subject: [PATCH] Fix Adreno blobs
+
+Change-Id: I2bc785760126a6e7bb72c644b34ceff063cd9691
+---
+ proprietary-files-qc.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
+index 867b8f7..d9b95f3 100644
+--- a/proprietary-files-qc.txt
++++ b/proprietary-files-qc.txt
+@@ -44,18 +44,17 @@ vendor/lib/egl/libGLESv1_CM_adreno.so
+ vendor/lib/egl/libGLESv2_adreno.so
+ vendor/lib/egl/libq3dtools_adreno.so
+ vendor/lib/libadreno_utils.so
+-vendor/lib/libbccQTI.so
+ vendor/lib/libC2D2.so
+ vendor/lib/libCB.so
+ vendor/lib/libc2d30-a3xx.so
+ vendor/lib/libgsl.so
+ vendor/lib/libllvm-qcom.so
+ vendor/lib/libOpenCL.so
++vendor/lib/libOpenVG.so
+ vendor/lib/libsc-a3xx.so
+ vendor/lib/libRSDriver_adreno.so
+ vendor/lib/librs_adreno.so
+ vendor/lib/librs_adreno_sha1.so
+-vendor/lib/libscale.so
+ vendor/lib/libuiblur.so
+ 
+ # Graphics firmware
+-- 
+2.13.2
+

Scripts/Generic_Deblob.sh

@@ -333,15 +333,6 @@ export -f deblobVendor;
 #
 
 
-#
-#Start of device fixes [LAOS SPECIFIC]
-#
-cd vendor/lge; git revert 846315c52044dd60a77da84b5180d4d93bb22ceb; cd $base; #Commit 846315c52044dd60a77da84b5180d4d93bb22ceb moves blobs but doesn't update their location in mako device tree
-#
-#End of device fixes
-#
-
-
 #
 #START OF DEBLOBBING
 #

Scripts/LAOS-14.1_Patches.sh

@@ -180,6 +180,7 @@ enter "device/oneplus/bacon"
 enableDexPreOpt
 enableGlonass
 sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/
+patch -p1 < $patches"android_device_oneplus_bacon/0001-Fix_Adreno_Blobs.patch"; #Fix setup-makefiles
 
 enter "kernel/oneplus/msm8974"
 patch -p1 < $patches"android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.patch" #300Mhz -> 268Mhz, 2.45Ghz -> 2.95Ghz	=+2.02Ghz XXX: Not 100% stable under intense workloads
@@ -188,6 +189,7 @@ enter "device/lge/mako"
 disableDexPreOpt #bootloops
 enableGlonass
 #patch -p1 < $patches"android_device_lge_mako/0001-Enable_LTE.patch" #Enable LTE support (Requires LTE hybrid modem to be flashed) XXX: Doesn't seem to work under 7.x
+patch -p1 < $patches"android_device_lge_mako/0002-Fix_TZ_Path.patch" #Fix setup-makefiles
 
 #enter "kernel/lge/mako"
 #patch -p1 < $patches"android_kernel_lge_mako/0001-OverUnderClock.patch" #384Mhz -> 81Mhz, 1.51Ghz -> 1.94Ghz	=+1.72Ghz XXX: Causes *excessively* long boot times