git: f7acb519547e - 2024Q1 - devel/android-tools: Fix build, include functional

The branch 2024Q1 has been updated by rhurlin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f7acb519547e2ccbd19699759a01027cc528d0c9

commit f7acb519547e2ccbd19699759a01027cc528d0c9
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-02-17 20:22:15 +0000
Commit:     Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2024-02-17 20:34:53 +0000

    devel/android-tools: Fix build, include functional
    
    While here, pet portlint.
    
    PR:             276983
    Reported by:    Ale <discipline@tiscali.it>
    MFH:            2024Q1
    
    (cherry picked from commit 6dbc3df04ebbe95dcad623ce76554fb52e26be3d)
---
 devel/android-tools/Makefile                                   |  5 +++--
 .../patch-vendor_adb_tls_include_adb_tls_tls__connection.h     | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
index 9890ad1ee988..b0a5e4ebfd49 100644
--- a/devel/android-tools/Makefile
+++ b/devel/android-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	android-tools
 PORTVERSION=	31.0.3p2.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 MASTER_SITES=	GH
 
@@ -31,9 +31,10 @@ 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>