diff options
author | osm0sis <osm0sis@outlook.com> | 2020-01-12 16:14:39 -0400 |
---|---|---|
committer | osm0sis <osm0sis@outlook.com> | 2020-01-12 16:14:39 -0400 |
commit | 4bae117013c14be05dc8fe892d201c9ce55fac20 (patch) | |
tree | 023748ae0e77148b50f1ee84eef988bd37ae5ab7 | |
parent | ef24a09b51cd09ec0c8d6c7426b4a87ff934bc31 (diff) |
AK3: fix AVBv1 signing on Android 10
-rwxr-xr-x | tools/ak3-core.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/ak3-core.sh b/tools/ak3-core.sh index f9a619d..8d7636a 100755 --- a/tools/ak3-core.sh +++ b/tools/ak3-core.sh @@ -361,8 +361,8 @@ flash_boot() { *recovery*|*SOS*) avbtype=recovery;; *) avbtype=boot;; esac; - if [ "$(/system/bin/dalvikvm -Xbootclasspath:/system/framework/core-oj.jar:/system/framework/core-libart.jar:/system/framework/conscrypt.jar:/system/framework/bouncycastle.jar -Xnodex2oat -Xnoimage-dex2oat -cp $bin/BootSignature_Android.jar com.android.verity.BootSignature -verify boot.img 2>&1 | grep VALID)" ]; then - /system/bin/dalvikvm -Xbootclasspath:/system/framework/core-oj.jar:/system/framework/core-libart.jar:/system/framework/conscrypt.jar:/system/framework/bouncycastle.jar -Xnodex2oat -Xnoimage-dex2oat -cp $bin/BootSignature_Android.jar com.android.verity.BootSignature /$avbtype boot-new.img $pk8 $cert boot-new-signed.img; + if [ "$(/system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/BootSignature_Android.jar com.android.verity.BootSignature -verify boot.img 2>&1 | grep VALID)" ]; then + /system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/BootSignature_Android.jar com.android.verity.BootSignature /$avbtype boot-new.img $pk8 $cert boot-new-signed.img; fi; fi; if [ $? != 0 -o "$signfail" ]; then |