From c21a8e5013f02c74cef0e90893400e879942ed34 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 15 Oct 2021 11:30:35 -0400
Subject: [PATCH] Don't create /persist => /mnt/vendor/persist symlink, some
 devices (Pixel 2) need it as a folder

---
 board-base.mk | 4 +++-
 rw-system.sh  | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/board-base.mk b/board-base.mk
index d792c9c..1ddacaf 100644
--- a/board-base.mk
+++ b/board-base.mk
@@ -3,5 +3,7 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth
 TARGET_EXFAT_DRIVER := exfat
 DEVICE_FRAMEWORK_MANIFEST_FILE := device/phh/treble/framework_manifest.xml
 
-BOARD_ROOT_EXTRA_FOLDERS += bt_firmware sec_storage efs
+BOARD_ROOT_EXTRA_FOLDERS += bt_firmware sec_storage efs persist
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
+
+BOARD_ROOT_EXTRA_SYMLINKS := $(filter-out $(BOARD_ROOT_EXTRA_SYMLINKS),/mnt/vendor/persist:/persist)
diff --git a/rw-system.sh b/rw-system.sh
index ea95fe6..a49e8f5 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -936,9 +936,7 @@ if [ "$vndk" -le 27 ];then
     setprop persist.sys.phh.no_present_or_validate true
 fi
 
-if grep -q /mnt/vendor/persist /vendor/etc/fstab.qcom;then
-    mount /mnt/vendor/persist /persist
-fi
+[ -d /mnt/vendor/persist ] && mount /mnt/vendor/persist /persist
 
 for f in $(find /sys -name fts_gesture_mode);do
     setprop persist.sys.phh.focaltech_node "$f"