From 96486ecf5c68160a34ea55159e4debd198ea0cc1 Mon Sep 17 00:00:00 2001
From: dkwo <npiazza@disroot.org>
Date: Thu, 17 Apr 2025 16:21:54 -0400
Subject: [PATCH] android-tools: update to 35.0.1

---
 srcpkgs/android-tools/patches/armhf.patch | 78 +++++++++++++++++++++++
 srcpkgs/android-tools/template            |  6 +-
 2 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/android-tools/patches/armhf.patch

diff --git a/srcpkgs/android-tools/patches/armhf.patch b/srcpkgs/android-tools/patches/armhf.patch
new file mode 100644
index 00000000000..d149c669658
--- /dev/null
+++ b/srcpkgs/android-tools/patches/armhf.patch
@@ -0,0 +1,78 @@
+This fixes the build on armhf by backporting the following boringssl patches:
+
+* https://github.com/google/boringssl/commit/af3c8953274748404ca8235d6cc31a2e1189e64f
+* https://github.com/google/boringssl/commit/12316ab445eef5317391a94bef733fa6ff175173
+
+diff -upr android-tools-35.0.1.orig/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl android-tools-35.0.1/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl
+--- android-tools-35.0.1.orig/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl	2024-05-17 16:29:30.474793795 +0200
++++ android-tools-35.0.1/vendor/boringssl/crypto/fipsmodule/sha/asm/sha256-armv4.pl	2024-05-17 16:30:35.428396067 +0200
+@@ -459,6 +459,14 @@ $code.=<<___;
+ .arch	armv7-a
+ .fpu	neon
+ 
++.LK256_shortcut_neon:
++@ PC is 8 bytes ahead in Arm mode and 4 bytes ahead in Thumb mode.
++#if defined(__thumb2__)
++.word	K256-(.LK256_add_neon+4)
++#else
++.word	K256-(.LK256_add_neon+8)
++#endif
++
+ .global	sha256_block_data_order_neon
+ .type	sha256_block_data_order_neon,%function
+ .align	5
+@@ -467,10 +475,21 @@ sha256_block_data_order_neon:
+ 	stmdb	sp!,{r4-r12,lr}
+ 
+ 	sub	$H,sp,#16*4+16
+-	@ In Arm mode, the following ADR runs up against the limits of encodable
+-	@ offsets. It only fits because the offset, when the ADR is placed here,
+-	@ is a multiple of 16.
+-	adr	$Ktbl,K256
++
++	@ K256 is just at the boundary of being easily referenced by an ADR from
++	@ this function. In Arm mode, when building with __ARM_ARCH=6, it does
++	@ not fit. By moving code around, we could make it fit, but this is too
++	@ fragile. For simplicity, just load the offset from
++	@ .LK256_shortcut_neon.
++	@
++	@ TODO(davidben): adrl would avoid a load, but clang-assembler does not
++	@ support it. We might be able to emulate it with a macro, but Android's
++	@ did not work when I tried it.
++	@ https://android.googlesource.com/platform/ndk/+/refs/heads/master/docs/ClangMigration.md#arm
++	ldr	$Ktbl,.LK256_shortcut_neon
++.LK256_add_neon:
++	add	$Ktbl,pc,$Ktbl
++
+ 	bic	$H,$H,#15		@ align for 128-bit stores
+ 	mov	$t2,sp
+ 	mov	sp,$H			@ alloca
+@@ -596,12 +615,12 @@ $code.=<<___;
+ #  define INST(a,b,c,d)	.byte	a,b,c,d
+ # endif
+ 
+-.LK256_shortcut:
++.LK256_shortcut_hw:
+ @ PC is 8 bytes ahead in Arm mode and 4 bytes ahead in Thumb mode.
+ #if defined(__thumb2__)
+-.word	K256-(.LK256_add+4)
++.word	K256-(.LK256_add_hw+4)
+ #else
+-.word	K256-(.LK256_add+8)
++.word	K256-(.LK256_add_hw+8)
+ #endif
+ 
+ .global	sha256_block_data_order_hw
+@@ -610,9 +629,9 @@ $code.=<<___;
+ sha256_block_data_order_hw:
+ 	@ K256 is too far to reference from one ADR command in Thumb mode. In
+ 	@ Arm mode, we could make it fit by aligning the ADR offset to a 64-byte
+-	@ boundary. For simplicity, just load the offset from .LK256_shortcut.
+-	ldr	$Ktbl,.LK256_shortcut
+-.LK256_add:
++	@ boundary. For simplicity, just load the offset from .LK256_shortcut_hw.
++	ldr	$Ktbl,.LK256_shortcut_hw
++.LK256_add_hw:
+ 	add	$Ktbl,pc,$Ktbl
+ 
+ 	vld1.32	{$ABCD,$EFGH},[$ctx]
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 09625d11a5a..01f99426011 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=34.0.5
-revision=2
+version=35.0.1
+revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
 build_style=cmake
 hostmakedepends="perl go protobuf pkg-config"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="https://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=fb09cff12cfb82acf42a8ebebbc0342671bfcd02117716368bdc73fdda60304a
+checksum=654030c7f96d25d7224cd6861fac14a043cf1d3980f40288cdfbe219f94ffaf9
 
 post_install() {
 	# zsh's built in works, while this one doesn't