From a13b2ddfa8d4fb7c535b95411d83192c1b777f97 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sat, 30 Jun 2018 23:42:40 -0400
Subject: [PATCH] Many changes

- SwiftShader progress
- Fix log spam after removal of AudioFX
- 15.1: Add starlte
- Misc tweaks/fixes
---
 Manifests/Manifest_LAOS-14.1.xml    |  1 -
 Manifests/Manifest_LAOS-15.1.xml    | 13 ++++++++-----
 Misc/Features/SwiftShader.txt       | 23 +++++++++++++++++++++++
 Scripts/Common/Deblob.sh            | 15 +++++++++++----
 Scripts/LineageOS-15.1/Functions.sh |  5 +++--
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index ed19b487..def2a5af 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -94,7 +94,6 @@
 	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
 <!-- END OF ADDITIONAL REPOS -->
 
-
 <!-- START OF DEVICE REPOS -->
 	<!-- Common -->
 	<project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" remote="github" />
diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 2ee98521..646c9eb2 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -66,15 +66,14 @@
 <!-- END OF UNNECESSARY REPO REMOVAL -->
 
 <!-- START OF BRANCH SWITCHING -->
-	<!-- master contains some necessary fixes -->
 	<remove-project name="platform/external/svox" />
 	<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
+
+	<remove-project name="platform/external/swiftshader" />
+	<project path="external/swiftshader" name="google/swiftshader" remote="github" revision="master" />
 <!-- END OF BRANCH SWITCHING -->
 
 <!-- START OF ADDITIONAL REPOS -->
-	<remove-project name="platform/external/swiftshader" />
-	<project path="external/swiftshader" name="google/swiftshader" remote="github" revision="master" />
-
 	<!-- MicroG -->
 	<project path="packages/apps/GmsCore" name="microg/android_packages_apps_GmsCore" remote="github" revision="master" />
 	<project path="packages/apps/GsfProxy" name="microg/android_packages_apps_GsfProxy" remote="github" revision="master" />
@@ -86,7 +85,6 @@
 	<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
 <!-- END OF ADDITIONAL REPOS -->
 
-
 <!-- START OF DEVICE REPOS -->
 	<!-- Common -->
 	<project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" remote="github" />
@@ -206,6 +204,11 @@
 	<project path="device/samsung/msm8974-common" name="LineageOS/android_device_samsung_msm8974-common" remote="github" />
 	<project path="kernel/samsung/msm8974" name="LineageOS/android_kernel_samsung_msm8974" remote="github" />
 
+	<!-- Samsung Galaxy S9 (starlte) -->
+	<project path="device/samsung/starlte" name="LineageOS/android_device_samsung_starlte" remote="github" />
+	<project path="device/samsung/star-common" name="LineageOS/android_device_samsung/star-common" remote="github" />
+	<project path="kernel/samsung/universal9810" name="LineageOS/android_kernel_samsung_universal9910" remote="github" />
+
 	<!-- NXP
 	<project path="vendor/nxp-nfc/opensource/frameworks" name="LineageOS/android_vendor_nxp-nfc_opensource_frameworks" remote="github" />
 	<project path="vendor/nxp-nfc/opensource/libnfc-nci" name="LineageOS/android_vendor_nxp-nfc_opensource_libnfc-nci" remote="github" />
diff --git a/Misc/Features/SwiftShader.txt b/Misc/Features/SwiftShader.txt
index c722f968..da4cbafe 100644
--- a/Misc/Features/SwiftShader.txt
+++ b/Misc/Features/SwiftShader.txt
@@ -12,3 +12,26 @@
 06-30 23:33:44.860  1445  1445 F DEBUG   :     #06 pc 00048837  /system/lib/libc.so (__pthread_start(void*)+22)
 06-30 23:33:44.860  1445  1445 F DEBUG   :     #07 pc 0001b155  /system/lib/libc.so (__start_thread+32)
 
+
+https://github.com/android-rpi/device_brcm_rpi3/wiki/Oreo-:-patch-framework-source
+https://github.com/android-rpi/device_brcm_rpi3/wiki
+
+frameworks/native/opengl/java/android/opengl/GLSurfaceView.java
+@@ line 976 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
+         public SimpleEGLConfigChooser(boolean withDepthBuffer) {
+-            super(8, 8, 8, 0, withDepthBuffer ? 16 : 0, 0);
++            super(8, 8, 8, 8, withDepthBuffer ? 24 : 0, 0);
+         }
+
+
+frameworks/base/opengl/libs/EGL/eglApi.cpp
+@@ line 478 @@ EGLSurface eglCreateWindowSurface(  EGLDisplay dpy, EGLConfig config,
+             // alpha-channel requested, there's really only one suitable format
+-            format = HAL_PIXEL_FORMAT_RGBA_8888;
++            format = HAL_PIXEL_FORMAT_BGRA_8888;
+         } else {
+@@ line 1843 @@ EGLClientBuffer eglCreateNativeClientBufferANDROID(const EGLint *attrib_list)
+         if (alpha_size == 8) {
+-            format = HAL_PIXEL_FORMAT_RGBA_8888;
++            format = HAL_PIXEL_FORMAT_BGRA_8888;
+         } else {
diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index 2ccb1892..41078e33 100755
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -58,6 +58,7 @@ echo "Deblobbing..."
 	#AudioFX (Audio Effects) [Qualcomm]
 	if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
 		blobs=$blobs"|fmas_eq.dat|libasphere.so|libbundlewrapper.so|libdownmix.so|libeffectproxy.so|libfmas.so|libldnhncr.so|libmmieffectswrapper.so|libqcbassboost.so|libqcomvisualizer.so|libqcomvoiceprocessing.so|libqcreverb.so|libqcvirt.so|libreverbwrapper.so|libshoebox.so|libspeakerbundle.so|libvisualizer.so|libvolumelistener.so|libLifevibes_lvverx.so|libhwdap.so";
+		makes=$makes"audio_effects.xml|libqcomvoiceprocessing";
 	fi;
 
 	#Camera
@@ -74,7 +75,7 @@ echo "Deblobbing..."
 	#CNE (Automatic Cell/Wi-Fi Switching) [Qualcomm]
 	#blobs=$blobs"|libcneapiclient.so|libNimsWrap.so"; #XXX: Breaks radio
 	blobs=$blobs"|andsfCne.xml|ATT_profile.*.xml|cnd|cneapiclient.jar|cneapiclient.xml|CNEService.apk|com.quicinc.cne.*.jar|com.quicinc.cne.*.so|com.quicinc.cne.xml|ConnectivityExt.jar|ConnectivityExt.xml|libcneconn.so|libcneqmiutils.so|libcne.so|libvendorconn.so|libwms.so|libwqe.so|profile1.xml|profile2.xml|profile3.xml|profile4.xml|profile5.xml|ROW_profile.*.xml|SwimConfig.xml|VZW_profile.*.xml";
-	makes=$makes"libcnefeatureconfig";
+	makes=$makes"|libcnefeatureconfig";
 	sepolicy=$sepolicy" cnd.te qcneservice.te";
 
 	#Diagnostics [Qualcomm]
@@ -87,6 +88,7 @@ echo "Deblobbing..."
 	blobs=$blobs"|discretix|DxHDCP.cfg|libDxHdcp.so";
 	blobs=$blobs"|dxhdcp.*";
 	blobs=$blobs"|dxcpr.*";
+	makes=$makes"|DxHDCP.cfg";
 
 	#Display Color Tuning [Qualcomm]
 	blobs=$blobs"|colorservice.apk|com.qti.snapdragon.sdk.display.jar|com.qti.snapdragon.sdk.display.xml|libdisp-aba.so|libmm-abl-oem.so|libmm-abl.so|libmm-als.so|libmm-color-convertor.so|libmm-disp-apis.so|libmm-qdcm.so|libsd_sdk_display.so|mm-pp-daemon|mm-pp-dpps|PPPreference.apk";
@@ -112,7 +114,7 @@ echo "Deblobbing..."
 	if [ "$DOS_DEBLOBBER_REMOVE_ACCESSORIES" = true ]; then
 		blobs=$blobs"|DragonKeyboardFirmwareUpdater.apk"; #dragon
 		blobs=$blobs"|ProjectorApp.apk|projectormod.xml|motorola.hardware.mods_camera.*|libcamera_mods_legacy_hal.so|mods_camd|MotCameraMod.apk|ModFmwkProxyService.apk|ModService.apk|libmodmanager.*.so|com.motorola.mod.*.so|libmodhw.so|com.motorola.modservice.xml"; #griffin
-		blobs=$blobs"|Score|Klik|vendor.essential.hardware.sidecar.*|vendor-essential-hardware-sidecar.xml"; #mata
+		blobs=$blobs"|[/]Score[/]|[/]Klik[/]|vendor.essential.hardware.sidecar.*|vendor-essential-hardware-sidecar.xml"; #mata
 	fi;
 
 	#Face Unlock [Google]
@@ -320,7 +322,7 @@ deblobDevice() {
 			echo "PRODUCT_PACKAGES += timekeep TimeKeep" >> device.mk; #Switch to Sony TimeKeep
 		fi;
 		if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-			echo "PRODUCT_PACKAGES += libEGL_swiftshader libGLESv1_CM_swiftshader libGLESv2_swiftshader" >> device.mk; #Build SwiftShader
+			echo "PRODUCT_PACKAGES += libyuv libEGL_swiftshader libGLESv1_CM_swiftshader libGLESv2_swiftshader" >> device.mk; #Build SwiftShader
 		fi;
 	fi;
 	if [ -f "${PWD##*/}".mk ] && [ "${PWD##*/}".mk != "sepolicy" ]; then
@@ -329,7 +331,7 @@ deblobDevice() {
 			echo "PRODUCT_PACKAGES += timekeep TimeKeep" >> "${PWD##*/}".mk; #Switch to Sony TimeKeep
 		fi;
 		if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
-			echo "PRODUCT_PACKAGES += libEGL_swiftshader libGLESv1_CM_swiftshader libGLESv2_swiftshader" >> "${PWD##*/}".mk; #Build SwiftShader
+			echo "PRODUCT_PACKAGES += libyuv libEGL_swiftshader libGLESv1_CM_swiftshader libGLESv2_swiftshader" >> "${PWD##*/}".mk; #Build SwiftShader
 		fi;
 	fi;
 	if [ -f system.prop ]; then
@@ -344,6 +346,11 @@ deblobDevice() {
 		sed -i 's/persist.rcs.supported=./persist.rcs.supported=0/' system.prop; #Disable RCS
 		sed -i 's/ro.bluetooth.emb_wp_mode=true/ro.bluetooth.emb_wp_mode=false/' system.prop; #Disable WiPower
 		sed -i 's/ro.bluetooth.wipower=true/ro.bluetooth.wipower=false/' system.prop; #Disable WiPower
+		if [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
+			echo "persist.sys.ui.hw=disable" >> system.prop;
+			echo "ro.graphics.gles20.disable_on_bootanim=1" >> system.prop;
+			sed -i 's/ro.opengles.version=.*/ro.opengles.version=131072/' system.prop;
+		fi;
 		#Disable IMS
 		if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
 		sed -i 's/persist.data.iwlan.enable=true/persist.data.iwlan.enable=false/' system.prop;
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index af2cca50..92a9bcd0 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-04-27
 
 patchAllKernels() {
-	startPatcher "kernel_essential_msm8998 kernel_google_dragon kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_htc_msm8974 kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_msm8974";
+	startPatcher "kernel_essential_msm8998 kernel_google_dragon kernel_google_marlin kernel_google_msm kernel_htc_flounder kernel_htc_msm8974 kernel_huawei_angler kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oppo_msm8974 kernel_samsung_msm8974 kernel_samsung_universal9910";
 }
 export -f patchAllKernels;
 
@@ -48,7 +48,7 @@ export -f buildDeviceDebug;
 
 buildAll() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
-	#TODO: hiae star2lte starlte
+	#TODO: hiae
 	brunch lineage_mako-user;
 	brunch lineage_d852-user;
 	brunch lineage_bacon-user;
@@ -69,6 +69,7 @@ buildAll() {
 	brunch lineage_mata-user;
 	brunch lineage_sailfish-user;
 	brunch lineage_shamu-user;
+	brunch lineage_starlte-user;
 	brunch lineage_us996-user;
 	brunch lineage_us997-user;
 	#brunch lineage_victara-user; #broken - recovery.img too large