From 41f0817f3fab4361216c5e3bce3660c5045f665b Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 29 Sep 2020 10:45:45 +0200 Subject: [PATCH] Up vendor minijail override, using vndk v28 minijail --- phh-on-boot.sh | 18 ++++++++++-------- phh-on-data.sh | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/phh-on-boot.sh b/phh-on-boot.sh index 969a18b..d2d5b0a 100644 --- a/phh-on-boot.sh +++ b/phh-on-boot.sh @@ -36,18 +36,20 @@ setprop ctl.stop storageproxyd sleep 10 +minijailSrc=/system/system_ext/apex/com.android.vndk.v28/lib/libminijail.so +minijailSrc64=/system/system_ext/apex/com.android.vndk.v28/lib64/libminijail.so if [ "$vndk" = 27 ];then - mount /system/lib64/vndk-27/libminijail.so /vendor/lib64/libminijail_vendor.so - mount /system/lib/vndk-27/libminijail.so /vendor/lib/libminijail_vendor.so + mount $minijailSrc64 /vendor/lib64/libminijail_vendor.so + mount $minijailSrc /vendor/lib/libminijail_vendor.so fi if [ "$vndk" = 28 ];then - mount /system/lib64/vndk-27/libminijail.so /vendor/lib64/libminijail_vendor.so - mount /system/lib/vndk-27/libminijail.so /vendor/lib/libminijail_vendor.so - mount /system/lib64/vndk-27/libminijail.so /system/lib64/vndk-28/libminijail.so - mount /system/lib/vndk-27/libminijail.so /system/lib/vndk-28/libminijail.so - mount /system/lib64/vndk-27/libminijail.so /vendor/lib64/libminijail.so - mount /system/lib/vndk-27/libminijail.so /vendor/lib/libminijail.so + mount $minijailSrc64 /vendor/lib64/libminijail_vendor.so + mount $minijailSrc /vendor/lib/libminijail_vendor.so + mount $minijailSrc64 /system/lib64/vndk-28/libminijail.so + mount $minijailSrc /system/lib/vndk-28/libminijail.so + mount $minijailSrc64 /vendor/lib64/libminijail.so + mount $minijailSrc /vendor/lib/libminijail.so fi #Clear looping services diff --git a/phh-on-data.sh b/phh-on-data.sh index 3901643..472d16e 100644 --- a/phh-on-data.sh +++ b/phh-on-data.sh @@ -14,16 +14,18 @@ if getprop persist.sys.phh.caf.media_profile |grep -q true;then fi +minijailSrc=/system/system_ext/apex/com.android.vndk.v28/lib/libminijail.so +minijailSrc64=/system/system_ext/apex/com.android.vndk.v28/lib64/libminijail.so if [ "$vndk" = 27 ];then - mount /system/lib64/vndk-27/libminijail.so /vendor/lib64/libminijail_vendor.so - mount /system/lib/vndk-27/libminijail.so /vendor/lib/libminijail_vendor.so + mount $minijailSrc64 /vendor/lib64/libminijail_vendor.so + mount $minijailSrc /vendor/lib/libminijail_vendor.so fi if [ "$vndk" = 28 ];then - mount /system/lib64/vndk-27/libminijail.so /vendor/lib64/libminijail_vendor.so - mount /system/lib/vndk-27/libminijail.so /vendor/lib/libminijail_vendor.so - mount /system/lib64/vndk-27/libminijail.so /system/lib64/vndk-28/libminijail.so - mount /system/lib/vndk-27/libminijail.so /system/lib/vndk-28/libminijail.so - mount /system/lib64/vndk-27/libminijail.so /vendor/lib64/libminijail.so - mount /system/lib/vndk-27/libminijail.so /vendor/lib/libminijail.so + mount $minijailSrc64 /vendor/lib64/libminijail_vendor.so + mount $minijailSrc /vendor/lib/libminijail_vendor.so + mount $minijailSrc64 /system/lib64/vndk-28/libminijail.so + mount $minijailSrc /system/lib/vndk-28/libminijail.so + mount $minijailSrc64 /vendor/lib64/libminijail.so + mount $minijailSrc /vendor/lib/libminijail.so fi