diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
index f447e07430ca..34635918b5b2 100644
--- a/devel/android-tools/Makefile
+++ b/devel/android-tools/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	android-tools
 PORTVERSION=	31.0.3p2.0
 PORTREVISION=	13
 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 go:no_targets perl5 python shebangfix
+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
 
 .include <bsd.port.mk>
diff --git a/devel/android-tools/files/patch-abseil b/devel/android-tools/files/patch-abseil
new file mode 100644
index 000000000000..be949a6aa119
--- /dev/null
+++ b/devel/android-tools/files/patch-abseil
@@ -0,0 +1,26 @@
+--- vendor/extras/libjsonpb/parse/jsonpb.cpp.orig	2022-06-10 23:11:16 UTC
++++ vendor/extras/libjsonpb/parse/jsonpb.cpp
+@@ -49,9 +49,9 @@ ErrorOr<std::string> MessageToJsonString(const Message
+ 
+   if (!status.ok()) {
+ #if GOOGLE_PROTOBUF_VERSION < 3016000
+-    return MakeError<std::string>(status.error_message().as_string());
++    return MakeError<std::string>(std::string(status.error_message()));
+ #else
+-    return MakeError<std::string>(status.message().as_string());
++    return MakeError<std::string>(std::string(status.message()));
+ #endif
+   }
+   return ErrorOr<std::string>(std::move(json));
+@@ -66,9 +66,9 @@ ErrorOr<std::monostate> JsonStringToMessage(const std:
+   auto status = JsonToBinaryString(resolver.get(), GetTypeUrl(*message), content, &binary);
+   if (!status.ok()) {
+ #if GOOGLE_PROTOBUF_VERSION < 3016000
+-    return MakeError<std::monostate>(status.error_message().as_string());
++    return MakeError<std::monostate>(std::string(status.error_message()));
+ #else
+-    return MakeError<std::monostate>(status.message().as_string());
++    return MakeError<std::monostate>(std::string(status.message()));
+ #endif
+   }
+   if (!message->ParseFromString(binary)) {