From 709668a4790eee4cd9ad86835e81726dfcd52f98 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Thu, 24 Sep 2026 13:17:57 -0400 Subject: [PATCH] sign-apk: match apksigner's 'V3.0 Signer:' lines too --- tools/release/sign-apk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index 73b7b745b..1337b9d76 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -81,10 +81,10 @@ rm -f "$out.idsig" # (Listed first, then searched: grep -q stops reading early, which fails a pipe under pipefail.) listing=$(unzip -l "$out") grep -qE 'META-INF/.*\.(SF|RSA)$' <<<"$listing" || die "$variant: no JAR signature (old installers)" -# Android 9+ must see our key and only our key. apksigner labels signers "Signer #1" or, in newer -# build-tools, "Signer (minSdkVersion=28, ...)"; the digests are what count. +# Android 9+ must see our key and only our key. apksigner labels signers "Signer #1", "Signer +# (minSdkVersion=28, ...)" or "V3.0 Signer:" depending on its version; the digests are what count. certs=$("$BUILD_TOOLS/apksigner" verify --min-sdk-version 28 --print-certs "$out") -v3=$(sed -n 's/^Signer.* certificate SHA-256 digest: //p' <<<"$certs" | sort -u) +v3=$(sed -n 's/^.*Signer.* certificate SHA-256 digest: //p' <<<"$certs" | sort -u) if [ "$v3" != "$expected" ]; then echo "$certs" >&2 die "$variant: Android 9+ sees signer(s) [$(tr '\n' ' ' <<<"$v3")], not only DroidDeck's key $expected"