Merge remote-tracking branch 'upstream/master'

Zile995 · Jun 14, 2023 · 6482b7f · 6482b7f
2 parents d3ea3b6 + c91542d
commit 6482b7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/LICENSE b/LICENSE
@@ -239,5 +239,5 @@ rkcrc: BSD 2-Clause License
 ## Additional Build Scripts for Listed Binaries (where used):
 
 osm0sis' Odds and Ends Thread - Knowledge Base:
-https://forum.xda-developers.com/showthread.php?p=53554719
+https://forum.xda-developers.com/t/tools-zips-scripts-osm0sis-odds-and-ends-multiple-devices-platforms.2239421/#post-53554719
 
diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script
@@ -3,4 +3,4 @@
 # Dummy file; update-binary is a shell script (DO NOT CHANGE)
 #
 #
-# AK_BASE_VERSION=20230526
+# AK_BASE_VERSION=20230605
diff --git a/tools/ak3-core.sh b/tools/ak3-core.sh
@@ -384,7 +384,7 @@ flash_boot() {
       *recovery*|*SOS*) avbtype=recovery;;
       *) avbtype=boot;;
     esac;
-    if [ "$(/system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/boot_signer-dexed.jar com.android.verity.BootSignature -verify boot.img 2>&1 | grep VALID)" ]; then
+    if [ -f /system/bin/dalvikvm ] && [ "$(/system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/boot_signer-dexed.jar com.android.verity.BootSignature -verify boot.img 2>&1 | grep VALID)" ]; then
       echo "Signing with AVBv1..." >&2;
       /system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/boot_signer-dexed.jar com.android.verity.BootSignature /$avbtype boot-new.img $pk8 $cert boot-new-signed.img;
     fi;