From ec32a3750a5a0557d84d79dd1c9b9fc83e4f8721 Mon Sep 17 00:00:00 2001 From: cfig Date: Mon, 25 Feb 2019 10:25:43 +0800 Subject: [PATCH] update README and misc refine --- README.md | 1 + bbootimg/src/main/kotlin/Signer.kt | 2 +- bbootimg/src/main/kotlin/avb/AVBInfo.kt | 2 +- doc/additional_tricks.md | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 93e7c96..98a991a 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ We now support both VB 1.0 and AVB 2.0 layouts. | Device Model | Manufacturer | Compatible | Android Version | Note | |--------------------------------|--------------|----------------------|--------------------------|------| | Pixel XL (marlin) | HTC | Y | 9.0.0 (PPR2.180905.006,
Sep 2018)| [more ...](doc/additional_tricks.md#pixel-xl-marlin) | +| Z18(NX606J) | ZTE | Y | 8.1.0 | [more...](doc/additional_tricks.md#nx606j) | | Nexus 9 (volantis/flounder) | HTC | Y(with some tricks) | 7.1.1 (N9F27M, Oct 2017) | [tricks](doc/additional_tricks.md#tricks-for-nexus-9volantis)| | Nexus 5x (bullhead) | LG | Y | 6.0.0_r12 (MDA89E) | | | Moto X (2013) T-Mobile | Motorola | N | | | diff --git a/bbootimg/src/main/kotlin/Signer.kt b/bbootimg/src/main/kotlin/Signer.kt index b9b8115..22243a4 100644 --- a/bbootimg/src/main/kotlin/Signer.kt +++ b/bbootimg/src/main/kotlin/Signer.kt @@ -54,7 +54,7 @@ class Signer { "--hash_algorithm ${sig.hashAlgorithm} " + "--algorithm ${sig.algorithm} " if (signKey!!.defaultKey.isNotBlank()) { - cmdlineStr += "--key ${signKey!!.defaultKey}" + cmdlineStr += "--key ${signKey.defaultKey}" } log.warn(cmdlineStr) val cmdLine = CommandLine.parse(cmdlineStr) diff --git a/bbootimg/src/main/kotlin/avb/AVBInfo.kt b/bbootimg/src/main/kotlin/avb/AVBInfo.kt index 26876f9..722674d 100755 --- a/bbootimg/src/main/kotlin/avb/AVBInfo.kt +++ b/bbootimg/src/main/kotlin/avb/AVBInfo.kt @@ -42,7 +42,7 @@ class AVBInfo(var header: Header? = null, this.hashTreeDescriptor.forEach { descList.add(it) } this.hashDescriptors.forEach { descList.add(it) } this.kernelCmdlineDescriptor.forEach { descList.add(it) } - this.chainPartitionDescriptor.forEach{ descList.add(it) } + this.chainPartitionDescriptor.forEach { descList.add(it) } this.unknownDescriptors.forEach { descList.add(it) } descList.sortBy { it.sequence } var ret = byteArrayOf() diff --git a/doc/additional_tricks.md b/doc/additional_tricks.md index 9fc48db..36f76aa 100644 --- a/doc/additional_tricks.md +++ b/doc/additional_tricks.md @@ -37,3 +37,8 @@ Now we can work with 'raw\_boot' Due to the configuration "BOARD_BUILD_SYSTEM_ROOT_IMAGE := true", the embeded ramdisk in boot.img is actually used in recovery mode. +## NX606J + +Thanks to the work by [CallMESuper], ZTE NX606J boot.img is also verified to be compatible with this toolkit. + +ROM download page: [http://ui.nubia.cn/rom/detail/56](http://ui.nubia.cn/rom/detail/56)