From bd279e6cbabc0da33f93dd88b5d344c8ed5be771 Mon Sep 17 00:00:00 2001 From: osm0sis Date: Wed, 15 Jan 2020 12:38:24 -0400 Subject: [PATCH] Backend: fix dalvikvm execution in recovery on Android 10 --- META-INF/com/google/android/update-binary | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary index 670bb2b..aa8492b 100755 --- a/META-INF/com/google/android/update-binary +++ b/META-INF/com/google/android/update-binary @@ -105,6 +105,9 @@ mount_apex() { *) $bb mount -o bind $apex $dest;; esac; done; + export ANDROID_RUNTIME_ROOT=/apex/com.android.runtime; + export ANDROID_TZDATA_ROOT=/apex/com.android.tzdata; + export BOOTCLASSPATH=/apex/com.android.runtime/javalib/core-oj.jar:/apex/com.android.runtime/javalib/core-libart.jar:/apex/com.android.runtime/javalib/okhttp.jar:/apex/com.android.runtime/javalib/bouncycastle.jar:/apex/com.android.runtime/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/android.test.base.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar; } umount_apex() { test -d /apex || return 1; @@ -117,6 +120,7 @@ umount_apex() { $bb losetup -d $loop) 2>/dev/null; done; rm -rf /apex; + unset ANDROID_RUNTIME_ROOT ANDROID_TZDATA_ROOT BOOTCLASSPATH; } restore_env() { test "$savedpath" && export LD_LIBRARY_PATH="$savedpath";