From 434250b1a7352a3f7f135be71bf316a18be95495 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Fri, 20 Apr 2018 20:03:21 +0200
Subject: [PATCH] CommonAddon: simplify backup_nlpconflicts

---
 CommonAddon | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/CommonAddon b/CommonAddon
index 31a9806..bde2277 100644
--- a/CommonAddon
+++ b/CommonAddon
@@ -69,24 +69,20 @@ ui_print () {
 
 backup_nlpconflicts () {
 	for app in ${GOOGLE_APPS}; do
-		if [ -d "/system/priv-app/${app}" ]; then
-			mkdir -p /sdcard/nanodroid_backups/priv-app/
-			rm -rf /sdcard/nanodroid_backups/priv-app/${app}
-			mv /system/priv-app/${app} /sdcard/nanodroid_backups/priv-app/
-
+		if [ -d "/system/priv-app/${app}" -o -d "/system/app/${app}" ]; then
 			ui_print " "
-			ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
+			ui_print " ++ Creating overlay for ${app}"
 			ui_print " ++ it conflicts with microG/location backends"
 			ui_print " "
-		elif [ -d "/system/app/${app}" ]; then
-			mkdir -p /sdcard/nanodroid_backups/app/
-			rm -rf /sdcard/nanodroid_backups/app/${app}
-			mv /system/app/${app} /sdcard/nanodroid_backups/app/
 
-			ui_print " "
-			ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
-			ui_print " ++ it conflicts with microG/location backends"
-			ui_print " "
+			if ! grep -q "^${app}" ${cfg_overlay}; then
+				echo ${app} >> ${cfg_overlay}
+			fi
+		fi
+
+		if [ "${ROM_NO_XBIN}" -eq 1 ]; then
+			system/bin/nanodroid-overlay --add ${app}
+		else	system/xbin/nanodroid-overlay --add ${app}
 		fi
 	done
 }