devel/android-tools: Fix build, include functional

While here, pet portlint. PR: 276983 Reported by: Ale <discipline@tiscali.it> MFH: 2024Q1
freebsd · Feb 17, 2024 · 6dbc3df · 6dbc3df
1 parent 78282c6
commit 6dbc3df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	android-tools
 PORTVERSION=	31.0.3p2.0
-PORTREVISION=	15
+PORTREVISION=	16
 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
@@ -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>