From 358439b6495685dc7917383f90ea5be345bd9b0e Mon Sep 17 00:00:00 2001
From: tenzap <fabstz-it@yahoo.fr>
Date: Mon, 17 Jan 2022 14:19:34 +0100
Subject: [PATCH] on Pie, remove also PrebuiltGmsCore

On pie emulator system-image, GmsCore is stored in priv-app/PrebuiltGmsCore and not in priv-app/PrebuiltGmsCorePi
so remove this too
---
 scripts/inc.installer.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/inc.installer.sh b/scripts/inc.installer.sh
index 140e2b9..fdd5bcf 100755
--- a/scripts/inc.installer.sh
+++ b/scripts/inc.installer.sh
@@ -35,6 +35,11 @@ makegappsremovetxt() {
     if [ -n "$packagetarget" ]; then
       gapps_remove="/system/$packagetarget$REMOVALSUFFIX
 $gapps_remove"
+      if [ $packagetarget = "priv-app/PrebuiltGmsCorePi" ]; then
+        # On Pie Emulator, the image has priv-app/PrebuiltGmsCore and not priv-app/PrebuiltGmsCorePi
+        gapps_remove="/system/priv-app/PrebuiltGmsCore$REMOVALSUFFIX
+$gapps_remove"
+      fi
     fi
     for lib in $packagelibs; do
       systemlibpath=""