replace Task.leftShift(Closure) with Task.doLast(Action)

pull/11/head
cfig 8 years ago
parent d7eb1fce89
commit 83bd158fc6

@ -70,9 +70,11 @@ task unpack_bootimg(type: JavaExec, dependsOn: ['abootimg:abootimg']) {
args String.format("%s", activeImg), workdir args String.format("%s", activeImg), workdir
} }
task unpack_ramdisk_gz << { task unpack_ramdisk_gz {
doLast {
unGnuzipFile(workdir+"/ramdisk.img.gz", workdir + "/ramdisk.img") unGnuzipFile(workdir+"/ramdisk.img.gz", workdir + "/ramdisk.img")
} }
}
unpack_ramdisk_gz.dependsOn(unpack_bootimg) unpack_ramdisk_gz.dependsOn(unpack_bootimg)
task unpack_cpio(type: Exec, dependsOn: unpack_ramdisk_gz) { task unpack_cpio(type: Exec, dependsOn: unpack_ramdisk_gz) {
@ -174,9 +176,11 @@ void gnuZipFile(String compressedFile, String decompressedFile) throws IOExcepti
} }
} }
task verify_clear(dependsOn: ['abootimg:pack_clear', 'abootimg:pack_clear2', 'abootimg:pack_clear3']) << { task verify_clear(dependsOn: ['abootimg:pack_clear', 'abootimg:pack_clear2', 'abootimg:pack_clear3']) {
doLast {
verifyClearImages(activeImg + ".clear", activeImg + ".clear2", activeImg + ".clear3"); verifyClearImages(activeImg + ".clear", activeImg + ".clear2", activeImg + ".clear3");
} }
}
task pack(type: JavaExec, dependsOn: [verify_clear, 'boot_signer:jar']) { task pack(type: JavaExec, dependsOn: [verify_clear, 'boot_signer:jar']) {
main = 'com.android.verity.BootSignature' main = 'com.android.verity.BootSignature'
@ -244,17 +248,21 @@ void updateBootImage(String activeImg) {
Run(cmd2) Run(cmd2)
} }
task flash << { task flash {
doLast {
updateBootImage(activeImg) updateBootImage(activeImg)
} }
}
void rebootRecovery() { void rebootRecovery() {
Run("adb reboot recovery") Run("adb reboot recovery")
} }
task rr << { task rr {
doLast {
rebootRecovery() rebootRecovery()
} }
}
void updateLinks(String inWorkdir) { void updateLinks(String inWorkdir) {
updateLinks(inWorkdir, 6); updateLinks(inWorkdir, 6);

Loading…
Cancel
Save