Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00
Code Issues Projects Releases Wiki Activity

patcher: improve apex compat (parts from @Teo-Lumifaza e1c3b1e3e4)

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2020-08-13 08:50:52 +02:00
parent bd25ad73c0
commit ccca18e0fe
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
patcher/CommonPatcher
View File

@ -1,7 +1,7 @@
#!/sbin/sh #!/sbin/sh
########################################################################################## ##########################################################################################
# #
# NanoDroid Patcher survival script # NanoDroid Patcher (Haystack Frontend)
# by Nanolx # by Nanolx
# #
########################################################################################## ##########################################################################################
@ -177,6 +177,9 @@ mount_partitions () {
[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)" [ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
mount_apex mount_apex
${BOOTMODE} && export LD_CONFIG_FILE="/system/etc/ld.config.txt" || \
export LD_CONFIG_FILE="${APEX_LD}/etc/ld.config.txt"
} }
umount_partitions () { umount_partitions () {
@ -342,8 +345,8 @@ detect_arch () {
export PATH="${BASEDIR}/busybox:/system/bin:/system/xbin" export PATH="${BASEDIR}/busybox:/system/bin:/system/xbin"
DALVIKVM_BIN=$(ls -l /system/bin/dalvikvm | awk '{print $NF}') DALVIKVM_BIN=$(ls -l ${APEX_LD}/bin/dalvikvm | awk '{print $NF}')
DALVIKVM_ARCH=$("${FILE}" -m "${BASEDIR}/magic.mgc" -L /system/bin/dalvikvm) DALVIKVM_ARCH=$("${FILE}" -m "${BASEDIR}/magic.mgc" -L ${APEX_LD}/bin/dalvikvm)
case ${DALVIKVM_BIN} in case ${DALVIKVM_BIN} in
*dalvikvm32* ) *dalvikvm32* )
@ -456,25 +459,16 @@ setup_patcher () {
call_dalvikvm () { call_dalvikvm () {
FRAME=/system/framework FRAME=/system/framework
APEXB=/apex/com.android.runtime/javalib APEXB=${APEX_LD}/javalib
if [ -d "${APEXB}" ]; then export BOOTCLASSPATH=${APEXB}/core-oj.jar:${APEXB}/core-libart.jar:${APEXB}/okhttp.jar:\
export BOOTCLASSPATH=${APEXB}/core-oj.jar:${APEXB}/core-libart.jar:\ ${APEXB}/bouncycastle.jar:${APEXB}/apache-xml.jar:${FRAME}/framework.jar:\
${APEXB}/okhttp.jar:${APEXB}/bouncycastle.jar:${APEXB}/apache-xml.jar:\ ${FRAME}/ext.jar:${FRAME}/telephony-common.jar:${FRAME}/voip-common.jar:\
${FRAME}/framework.jar:${FRAME}/ext.jar:${FRAME}/telephony-common.jar:\ ${FRAME}/ims-common.jar:${FRAME}/android.test.base.jar:${FRAME}/telephony-ext.jar:\
${FRAME}/voip-common.jar:${FRAME}/ims-common.jar:${FRAME}/android.test.base.jar:\
${FRAME}/telephony-ext.jar:\
/apex/com.android.conscrypt/javalib/conscrypt.jar:\ /apex/com.android.conscrypt/javalib/conscrypt.jar:\
/apex/com.android.media/javalib/updatable-media.jar /apex/com.android.media/javalib/updatable-media.jar
else
export BOOTCLASSPATH=${FRAME}/core-oj.jar:${FRAME}/core-libart.jar:\
${FRAME}/okhttp.jar:${FRAME}/bouncycastle.jar:${FRAME}/apache-xml.jar:\
${FRAME}/framework.jar:${FRAME}/ext.jar:${FRAME}/telephony-common.jar:\
${FRAME}/voip-common.jar:${FRAME}/ims-common.jar:${FRAME}/android.test.base.jar:\
${FRAME}/telephony-ext.jar
fi
supported_opts=$(/system/bin/dalvikvm --help 2>&1) supported_opts=$(${APEX_LD}/bin/dalvikvm --help 2>&1)
DALVIKVM_OPTS="" DALVIKVM_OPTS=""
@ -484,7 +478,7 @@ ${FRAME}/telephony-ext.jar
[[ "${supported_opts}" == *verbose:*jni* ]] && DALVIKVM_OPTS="${DALVIKVM_OPTS} -verbose:jni" [[ "${supported_opts}" == *verbose:*jni* ]] && DALVIKVM_OPTS="${DALVIKVM_OPTS} -verbose:jni"
[[ "${supported_opts}" == *verbose:*class* ]] && DALVIKVM_OPTS="${DALVIKVM_OPTS} -verbose:class" [[ "${supported_opts}" == *verbose:*class* ]] && DALVIKVM_OPTS="${DALVIKVM_OPTS} -verbose:class"
/system/bin/dalvikvm ${DALVIKVM_OPTS} "${@}" ${APEX_LD}/bin/dalvikvm ${DALVIKVM_OPTS} "${@}"
} }
deodex_vdex () { deodex_vdex () {