From b683d40ef3868cbf307df43c4992a2a2b6a797e8 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sat, 9 Jan 2021 13:37:06 -0500
Subject: [PATCH] Small tweaks

- Update cherry picks
- Add star2lte to 15.1 and 17.1
---
 Manifests/Manifest_LAOS-15.1.xml    | 3 +++
 Manifests/Manifest_LAOS-17.1.xml    | 3 +++
 Patches/Linux                       | 2 +-
 Scripts/LineageOS-14.1/Functions.sh | 1 +
 Scripts/LineageOS-15.1/Functions.sh | 2 ++
 Scripts/LineageOS-16.0/Functions.sh | 1 +
 Scripts/LineageOS-17.1/Functions.sh | 2 ++
 7 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 64ff6302..f0ae878d 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -264,6 +264,9 @@
 	<project path="device/samsung/universal9810-common" name="LineageOS/android_device_samsung_universal9810-common" remote="github" />
 	<project path="kernel/samsung/universal9810" name="LineageOS/android_kernel_samsung_universal9810" remote="github" />
 
+	<!-- Samsung Galaxy S9+ (star2lte) -->
+	<project path="device/samsung/star2lte" name="LineageOS/android_device_samsung_star2lte" remote="github" />
+
 	<!-- Wileyfox Storm (kipper) -->
 	<project path="device/wileyfox/kipper" name="LineageOS/android_device_wileyfox_kipper" remote="github" />
 	<project path="device/cyanogen/msm8916-common" name="LineageOS/android_device_cyanogen_msm8916-common" remote="github" />
diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index c11d70f7..56d02bb1 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -267,6 +267,9 @@
 	<project path="device/samsung/universal9810-common" name="LineageOS/android_device_samsung_universal9810-common" remote="github" />
 	<project path="kernel/samsung/universal9810" name="LineageOS/android_kernel_samsung_universal9810" remote="github" />
 
+	<!-- Samsung Galaxy S9+ (star2lte) -->
+	<project path="device/samsung/star2lte" name="LineageOS/android_device_samsung_star2lte" remote="github" />
+
 	<!-- Wileyfox Swift (crackling) -->
 	<project path="device/wileyfox/crackling" name="LineageOS/android_device_wileyfox_crackling" remote="github" />
 	<project path="device/cyanogen/msm8916-common" name="LineageOS/android_device_cyanogen_msm8916-common" remote="github" />
diff --git a/Patches/Linux b/Patches/Linux
index 7f7cae38..dc164c26 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 7f7cae382405337ff94a887c4a0ce5a1e42c082f
+Subproject commit dc164c266adc5400946b9e8b706b5a8a1900dfc4
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index ebce31c3..3d338f42 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -121,6 +121,7 @@ patchWorkspace() {
 	repopick -it n_asb_09-2018-qcom;
 	#repopick -it bt-sbc-hd-dualchannel-nougat;
 	repopick -it n-asb-2021-01;
+	repopick -it 300742; #update webview
 
 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
 
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 31896570..1a0220c3 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -102,6 +102,7 @@ buildAll() {
 		buildDevice enchilada avb;
 		buildDeviceUserDebug i9100;
 		buildDevice starlte; #broken - device/samsung/universal9810-common/audio: MODULE.TARGET.SHARED_LIBRARIES.libshim_audio_32 already defined by device/samsung/star-common/audio
+		buildDevice star2lte;
 		buildDevice yellowstone;
 	fi;
 }
@@ -112,6 +113,7 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	repopick -it O_asb_2021-01;
+	repopick -it 300742; #update webview
 
 	export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails
 
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index dd007322..17558dbc 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -133,6 +133,7 @@ patchWorkspace() {
 	repopick -i 232948; #wahoo: liblight: close fd
 	#repopick -it pie-firewall;
 	repopick -it P_asb_2021-01;
+	repopick -it 300742; #update webview
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 2a626e6c..3050e4aa 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -117,6 +117,7 @@ buildAll() {
 	buildDevice sargo avb;
 	#Exynos
 	buildDevice starlte;
+	buildDevice star2lte;
 	#Tegra
 	buildDevice yellowstone; #broken
 }
@@ -129,6 +130,7 @@ patchWorkspace() {
 	repopick -i 271361; #releasetools: python3 fix, 287339 (alt)
 	#repopick -it ten-firewall;
 	repopick -it Q_asb_2021-01;
+	repopick -it 300742; #update webview
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";