From 3e7b65729571650ca5a374535fa5eed17bb1f5f3 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 13 May 2022 19:39:06 -0400
Subject: [PATCH] Tweaks

Signed-off-by: Tad <tad@spotco.us>
---
 Manifests/Manifest_LAOS-19.1.xml    | 4 ++--
 Scripts/LineageOS-17.1/Functions.sh | 3 +--
 Scripts/LineageOS-18.1/Patch.sh     | 1 +
 Scripts/LineageOS-19.1/Functions.sh | 2 +-
 Scripts/LineageOS-19.1/Patch.sh     | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Manifests/Manifest_LAOS-19.1.xml b/Manifests/Manifest_LAOS-19.1.xml
index 35321fbd..1c105928 100644
--- a/Manifests/Manifest_LAOS-19.1.xml
+++ b/Manifests/Manifest_LAOS-19.1.xml
@@ -63,8 +63,8 @@
 	<project path="packages/apps/ElmyraService" name="LineageOS/android_packages_apps_ElmyraService" remote="github" />
 
 	<!-- Essential PH-1 (mata) -->
-	<project path="device/essential/mata" name="npjohnson/android_device_essential_mata" remote="github" />
-	<project path="kernel/essential/msm8998" name="npjohnson/android_kernel_essential_msm8998" remote="github" />
+	<project path="device/essential/mata" name="LineageOS/android_device_essential_mata" remote="github" />
+	<project path="kernel/essential/msm8998" name="LineageOS/android_kernel_essential_msm8998" remote="github" />
 
 	<!-- F(x)tec Pro¹ (pro1) -->
 	<project path="device/fxtec/pro1" name="LineageOS/android_device_fxtec_pro1" remote="github" />
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 1ef70c8e..4b20fde9 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -83,9 +83,8 @@ patchWorkspace() {
 	touch DOS_PATCHED_FLAG;
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
-	source build/envsetup.sh;
+	#source build/envsetup.sh;
 	#repopick -it ten-firewall;
-	repopick -it Q_asb_2022-05
 
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index addad2d4..64114cc2 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -393,6 +393,7 @@ patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --direct
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/27.0";
 patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/26.0";
 awk -i inplace '!/true cannot be used in user builds/' Android.mk; #Allow ignoring neverallows under -user
+awk -i inplace '!/domain=gmscore_app/' private/seapp_contexts prebuilts/api/*/private/seapp_contexts; #Disable unused gmscore_app domain (GrapheneOS)
 fi;
 
 if enterAndClear "system/update_engine"; then
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index 2d95a8d3..bbd9b298 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -62,7 +62,7 @@ buildAll() {
 	buildDevice cheryl verity;
 	#buildDevice cheeseburger verity; #unb, radio broken pending upstream merge
 	#buildDevice dumpling verity;
-	buildDevice mata verity; #unb, unofficial pending upstream merge
+	buildDevice mata verity; #unb, pending upstream merge
 	buildDevice taimen avb;
 	buildDevice walleye avb;
 	#SD845
diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh
index a5c41eb5..7ad13018 100644
--- a/Scripts/LineageOS-19.1/Patch.sh
+++ b/Scripts/LineageOS-19.1/Patch.sh
@@ -356,6 +356,7 @@ if [ "$DOS_GRAPHENE_PTRACE_SCOPE" = true ]; then
 applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-1.patch"; #Allow init to control kernel.yama.ptrace_scope (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-2.patch"; #Allow system to use persist.native_debug (GrapheneOS)
 fi;
+awk -i inplace '!/domain=gmscore_app/' private/seapp_contexts prebuilts/api/*/private/seapp_contexts; #Disable unused gmscore_app domain (GrapheneOS)
 fi;
 
 if enterAndClear "system/update_engine"; then