diff options
| -rwxr-xr-x | tools/ak3-core.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/ak3-core.sh b/tools/ak3-core.sh index de60295..d758e48 100755 --- a/tools/ak3-core.sh +++ b/tools/ak3-core.sh @@ -244,7 +244,7 @@ flash_boot() { varlist="name arch os type comp addr ep"; elif [ -f "$bin/mkbootimg" -a -f "$bin/unpackelf" -a -f boot.img-base ]; then mv -f cmdline.txt boot.img-cmdline 2>/dev/null; - varlist="cmdline base pagesize kerneloff ramdiskoff tagsoff"; + varlist="cmdline base pagesize kernel_offset ramdisk_offset tags_offset"; fi; for i in $varlist; do if [ -f boot.img-$i ]; then @@ -304,7 +304,7 @@ flash_boot() { $bin/rkcrc -k $ramdisk $home/boot-new.img; elif [ -f "$bin/mkbootimg" -a -f "$bin/unpackelf" -a -f boot.img-base ]; then test "$dt" && dt="--dt $dt"; - $bin/mkbootimg --kernel $kernel --ramdisk $ramdisk --cmdline "$cmdline" --base $home --pagesize $pagesize --kernel_offset $kerneloff --ramdisk_offset $ramdiskoff --tags_offset "$tagsoff" $dt --output $home/boot-new.img; + $bin/mkbootimg --kernel $kernel --ramdisk $ramdisk --cmdline "$cmdline" --base $home --pagesize $pagesize --kernel_offset $kernel_offset --ramdisk_offset $ramdisk_offset --tags_offset "$tags_offset" $dt --output $home/boot-new.img; else test "$kernel" && cp -f $kernel kernel; test "$ramdisk" && cp -f $ramdisk ramdisk.cpio; @@ -369,16 +369,16 @@ flash_boot() { fi; test $? != 0 && signfail=1; fi; - if [ -f "$bin/BootSignature_Android.jar" -a -d "$bin/avb" ]; then + if [ -f "$bin/boot_signer-dexed.jar" -a -d "$bin/avb" ]; then pk8=$(ls $bin/avb/*.pk8); cert=$(ls $bin/avb/*.x509.*); case $block in *recovery*|*SOS*) avbtype=recovery;; *) avbtype=boot;; esac; - if [ "$(/system/bin/dalvikvm -Xnoimage-dex2oat -cp $bin/BootSignature_Android.jar com.android.verity.BootSignature -verify boot.img 2>&1 | grep VALID)" ]; then + if [ "$(/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/BootSignature_Android.jar com.android.verity.BootSignature /$avbtype boot-new.img $pk8 $cert boot-new-signed.img; + /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; fi; if [ $? != 0 -o "$signfail" ]; then |