From 26cda44016f71e8f929fa6ebe22f714628ad8164 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 29 Nov 2020 19:19:43 -0500
Subject: [PATCH] Add support for rs988, h990, and h870

---
 Manifests/Manifest_LAOS-14.1.xml    | 9 ++++++---
 Manifests/Manifest_LAOS-15.1.xml    | 9 ++++++---
 Manifests/Manifest_LAOS-17.1.xml    | 6 ++++--
 Scripts/LineageOS-14.1/Functions.sh | 6 +++++-
 Scripts/LineageOS-15.1/Functions.sh | 6 +++++-
 Scripts/LineageOS-17.1/Functions.sh | 2 ++
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index c65aca6e..a1358187 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -137,20 +137,23 @@
 	<project path="device/lge/h815" name="LineageOS/android_device_lge_h815" remote="github" />
 	<project path="kernel/lge/msm8992" name="LineageOS/android_kernel_lge_msm8992" remote="github" />
 
-	<!-- LG G5 (h850) -->
+	<!-- LG G5 (h850:intl, rs988:us) -->
 	<project path="device/lge/common" name="LineageOS/android_device_lge_common" remote="github" />
 	<project path="device/lge/g5-common" name="LineageOS/android_device_lge_g5-common" remote="github" />
 	<project path="device/lge/h850" name="LineageOS/android_device_lge_h850" remote="github" />
+	<project path="device/lge/rs988" name="LineageOS/android_device_lge_rs988" remote="github" />
 	<project path="device/lge/msm8996-common" name="LineageOS/android_device_lge_msm8996-common" remote="github" />
 	<project path="kernel/lge/msm8996" name="LineageOS/android_kernel_lge_msm8996" remote="github" />
 
-	<!-- LG V20 (us996) -->
+	<!-- LG V20 (h990:intl, us996:us) -->
 	<project path="device/lge/v20-common" name="LineageOS/android_device_lge_v20-common" remote="github" />
+	<project path="device/lge/h990" name="LineageOS/android_device_lge_h990" remote="github" />
 	<project path="device/lge/us996" name="LineageOS/android_device_lge_us996" remote="github" />
 	<!-- uses lge msm8996 commons -->
 
-	<!-- LG G6 (us997) -->
+	<!-- LG G6 (h870:intl, us997:us) -->
 	<project path="device/lge/g6-common" name="LineageOS/android_device_lge_g6-common" remote="github" />
+	<project path="device/lge/h870" name="LineageOS/android_device_lge_h870" remote="github" />
 	<project path="device/lge/us997" name="LineageOS/android_device_lge_us997" remote="github" />
 	<!-- uses lge msm8996 commons -->
 
diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 08a5fbcd..64ff6302 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -153,20 +153,23 @@
 	<project path="device/lge/d855" name="LineageOS/android_device_lge_d855" remote="github" />
 	<project path="kernel/lge/g3" name="LineageOS/android_kernel_lge_g3" remote="github" />
 
-	<!-- LG G5 (h850) -->
+	<!-- LG G5 (h850:intl, rs988:us) -->
 	<project path="device/lge/common" name="LineageOS/android_device_lge_common" remote="github" />
 	<project path="device/lge/g5-common" name="LineageOS/android_device_lge_g5-common" remote="github" />
 	<project path="device/lge/h850" name="LineageOS/android_device_lge_h850" remote="github" />
+	<project path="device/lge/rs988" name="LineageOS/android_device_lge_rs988" remote="github" />
 	<project path="device/lge/msm8996-common" name="LineageOS/android_device_lge_msm8996-common" remote="github" />
 	<project path="kernel/lge/msm8996" name="LineageOS/android_kernel_lge_msm8996" remote="github" />
 
-	<!-- LG V20 (us996) -->
+	<!-- LG V20 (h990:intl, us996:us) -->
 	<project path="device/lge/v20-common" name="LineageOS/android_device_lge_v20-common" remote="github" />
+	<project path="device/lge/h990" name="LineageOS/android_device_lge_h990" remote="github" />
 	<project path="device/lge/us996" name="LineageOS/android_device_lge_us996" remote="github" />
 	<!-- uses lge msm8996 commons -->
 
-	<!-- LG G6 (us997) -->
+	<!-- LG G6 (h870:intl, us997:us) -->
 	<project path="device/lge/g6-common" name="LineageOS/android_device_lge_g6-common" remote="github" />
+	<project path="device/lge/h870" name="LineageOS/android_device_lge_h870" remote="github" />
 	<project path="device/lge/us997" name="LineageOS/android_device_lge_us997" remote="github" />
 	<!-- uses lge msm8996 commons -->
 
diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index 9e44876b..01b9787f 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -158,15 +158,17 @@
 	<project path="device/lge/d855" name="LineageOS/android_device_lge_d855" remote="github" />
 	<project path="kernel/lge/g3" name="LineageOS/android_kernel_lge_g3" remote="github" />
 
-	<!-- LG G5 (h850) -->
+	<!-- LG G5 (h850:intl, rs988:us) -->
 	<project path="device/lge/common" name="LineageOS/android_device_lge_common" remote="github" />
 	<project path="device/lge/g5-common" name="LineageOS/android_device_lge_g5-common" remote="github" />
 	<project path="device/lge/h850" name="LineageOS/android_device_lge_h850" remote="github" />
+	<project path="device/lge/rs988" name="LineageOS/android_device_lge_rs988" remote="github" />
 	<project path="device/lge/msm8996-common" name="LineageOS/android_device_lge_msm8996-common" remote="github" />
 	<project path="kernel/lge/msm8996" name="LineageOS/android_kernel_lge_msm8996" remote="github" />
 
-	<!-- LG V20 (us996) -->
+	<!-- LG V20 (h990:intl, us996:us) -->
 	<project path="device/lge/v20-common" name="LineageOS/android_device_lge_v20-common" remote="github" />
+	<project path="device/lge/h990" name="LineageOS/android_device_lge_h990" remote="github" />
 	<project path="device/lge/us996" name="LineageOS/android_device_lge_us996" remote="github" />
 	<!-- uses lge msm8996 commons -->
 
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 6d68f271..e975f364 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -102,9 +102,12 @@ buildAll() {
 		buildDevice oneplus3;
 		buildDevice griffin;
 		buildDevice h850;
+		buildDevice rs988;
+		buildDevice h990;
 		buildDevice us996;
 		buildDevice marlin verity;
 		buildDevice sailfish verity;
+		buildDevice h870;
 		buildDevice us997;
 		buildDevice dragon verity;
 		buildDevice fugu;
@@ -137,13 +140,14 @@ patchWorkspace() {
 	##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong
 	cd device/asus/Z00T && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE";
 	cd device/lge/h850 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE";
+	cd device/lge/rs988 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE";
 }
 export -f patchWorkspace;
 
 enableDexPreOpt() {
 	cd "$DOS_BUILD_BASE$1";
 	#Some devices won't compile, or have too small of a /system partition, or Wi-Fi breaks
-	if [ "$1" != "device/amazon/thor" ] && [ "$1" != "device/samsung/i9100" ] && [ "$1" != "device/samsung/maguro" ] && [ "$1" != "device/samsung/toro" ] && [ "$1" != "device/samsung/toroplus" ] && [ "$1" != "device/samsung/tuna" ] && [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/mako" ] && [ "$1" != "device/asus/grouper" ]; then
+	if [ "$1" != "device/amazon/thor" ] && [ "$1" != "device/samsung/i9100" ] && [ "$1" != "device/samsung/maguro" ] && [ "$1" != "device/samsung/toro" ] && [ "$1" != "device/samsung/toroplus" ] && [ "$1" != "device/samsung/tuna" ] && [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/rs988" ] && [ "$1" != "device/lge/mako" ] && [ "$1" != "device/asus/grouper" ]; then
 		if [ -f BoardConfig.mk ]; then
 			echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
 			echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk;
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 3b7570c3..2157df0c 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -60,6 +60,7 @@ buildAll() {
 	buildDevice angler verity;
 	buildDevice Z00T; #broken - needs vendor patching
 	buildDevice axon7; #broken - needs vendor patching
+	buildDevice h870;
 	buildDevice us997;
 	buildDevice flounder verity;
 	buildDevice dragon verity;
@@ -85,8 +86,10 @@ buildAll() {
 		buildDevice ether;
 		buildDevice kipper;
 		buildDevice oneplus3;
+		buildDevice h990;
 		buildDevice us996;
 		buildDevice h850; #broken
+		buildDevice rs988;
 		buildDevice griffin;
 		buildDevice marlin verity;
 		buildDevice sailfish verity;
@@ -125,13 +128,14 @@ patchWorkspace() {
 	#Deblobbing fixes
 	##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong
 	cd device/lge/h850 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE";
+	cd device/lge/rs988 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE";
 }
 export -f patchWorkspace;
 
 enableDexPreOpt() {
 	cd "$DOS_BUILD_BASE$1";
 	#Some devices won't compile, or have too small of a /system partition, or Wi-Fi breaks
-	if [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/mako" ]; then
+	if [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/rs988" ] && [ "$1" != "device/lge/mako" ]; then
 		if [ -f BoardConfig.mk ]; then
 			echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
 			echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk;
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 02a4a991..46a779c8 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -82,6 +82,8 @@ buildAll() {
 	buildDevice oneplus2;
 	#SD820
 	buildDevice h850;
+	buildDevice rs988;
+	buildDevice h990;
 	buildDevice us996;
 	buildDevice griffin;
 	buildDevice oneplus3 verity;