diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
index 12cd95a7da59..699c99f8e4d8 100644
--- a/devel/android-tools/Makefile
+++ b/devel/android-tools/Makefile
@@ -1,39 +1,40 @@
 PORTNAME=	android-tools
 PORTVERSION=	31.0.3p2.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	devel
 MASTER_SITES=	GH
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Android debugging tools
 WWW=		https://github.com/neelchauhan/freebsd-android-tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	ld: error: undefined symbol: OPENSSL_cpuid_setup
 
 LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli \
 		libgmock.so:devel/googletest \
 		liblz4.so:archivers/liblz4 \
 		libpcre2-8.so:devel/pcre2 \
 		libprotobuf.so:devel/protobuf \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang go:no_targets localbase:ldflags perl5 python shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	neelchauhan
 GH_PROJECT=	freebsd-${PORTNAME}
 GH_TAGNAME=	271d7a26c8daf4b9fe412d360a2edfaca327efdd
 
 SHEBANG_FILES=	vendor/mkbootimg/repack_bootimg.py \
 		vendor/mkbootimg/mkbootimg.py \
 		vendor/mkbootimg/unpack_bootimg.py
 
-LDFLAGS+=	-labsl_status
 MAKE_ENV+=	GOFLAGS=-mod=vendor \
 		GOPATH=${WRKSRC}/vendor/boringssl/vendor \
 		GOPROXY=off
 
+LDFLAGS+=	-labsl_status
+
 .include <bsd.port.mk>
diff --git a/devel/android-tools/files/patch-vendor_adb_tls_include_adb_tls_tls__connection.h b/devel/android-tools/files/patch-vendor_adb_tls_include_adb_tls_tls__connection.h
new file mode 100644
index 000000000000..afc4ed589316
--- /dev/null
+++ b/devel/android-tools/files/patch-vendor_adb_tls_include_adb_tls_tls__connection.h
@@ -0,0 +1,10 @@
+--- vendor/adb/tls/include/adb/tls/tls_connection.h.orig	2024-02-11 15:40:31 UTC
++++ vendor/adb/tls/include/adb/tls/tls_connection.h
+@@ -21,6 +21,7 @@
+ 
+ #include <string_view>
+ #include <vector>
++#include <functional>
+ 
+ #include <android-base/unique_fd.h>
+ #include <openssl/ssl.h>