diff --git a/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch b/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
deleted file mode 100644
index 0d883b4f0fb..00000000000
--- a/srcpkgs/android-tools/patches/0001-vendor-CMakeLists-fix-dependencies-on-protobuf-heade.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 41f92b797aa6bf4609b6b31e42bd37df710ae7aa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Mon, 25 Jan 2021 08:25:31 +0700
-Subject: [PATCH] vendor: CMakeLists: fix dependencies on protobuf header
-
-While we're at it, simplify OBJECT_DEPENDS as pointed out in
-https://cmake.org/cmake/help/v3.18/prop_sf/OBJECT_DEPENDS.html
-
-This fix a broken build because of a race as shown in:
-https://github.com/void-linux/void-packages/pull/28209/checks?check_run_id=1758983334
----
- vendor/CMakeLists.adb.txt | 23 ++++++++---------------
- 1 file changed, 8 insertions(+), 15 deletions(-)
-
-diff --git vendor/CMakeLists.adb.txt vendor/CMakeLists.adb.txt
-index 1495a5d..5206a80 100644
---- vendor/CMakeLists.adb.txt
-+++ vendor/CMakeLists.adb.txt
-@@ -34,19 +34,10 @@ add_library(libadb STATIC
- 	core/adb/sysdeps_unix.cpp
- 	core/adb/sysdeps/errno.cpp
- 	core/adb/sysdeps/posix/network.cpp
--	${ADB_APP_PROCESSES_PROTO_SRCS}
--	${ADB_KNOWN_HOSTS_PROTO_SRCS}
--	${ADB_KEY_TYPE_PROTO_SRCS}
--	${ADB_PAIRING_PROTO_SRCS})
--
--set_property(SOURCE core/adb/client/commandline.cpp
--	PROPERTY OBJECT_DEPENDS ${ADB_APP_PROCESSES_PROTO_HDRS})
--set_property(SOURCE core/adb/client/adb_wifi.cpp
--	PROPERTY OBJECT_DEPENDS ${ADB_KNOWN_HOSTS_PROTO_HDRS})
--set_property(SOURCE core/adb/client/auth.cpp
--	PROPERTY OBJECT_DEPENDS ${ADB_KEY_TYPE_PROTO_HDRS})
--set_property(SOURCE core/adb/pairing_connection/pairing_connection.cpp
--	PROPERTY OBJECT_DEPENDS ${ADB_PAIRING_PROTO_HDRS})
-+	${ADB_APP_PROCESSES_PROTO_SRCS} ${ADB_APP_PROCESSES_PROTO_HDRS}
-+	${ADB_KNOWN_HOSTS_PROTO_SRCS} ${ADB_KNOWN_HOSTS_PROTO_HDRS}
-+	${ADB_KEY_TYPE_PROTO_SRCS} ${ADB_KEY_TYPE_PROTO_HDRS}
-+	${ADB_PAIRING_PROTO_SRCS} ${ADB_PAIRING_PROTO_HDRS})
- 
- target_compile_definitions(libadb PRIVATE -D_GNU_SOURCE)
- target_compile_definitions(libadb PUBLIC -DADB_HOST=1)
-@@ -68,7 +59,8 @@ target_include_directories(libadb PUBLIC
- add_library(libadb_crypto_defaults STATIC
- 	core/adb/crypto/key.cpp
- 	core/adb/crypto/rsa_2048_key.cpp
--	core/adb/crypto/x509_generator.cpp)
-+	core/adb/crypto/x509_generator.cpp
-+	${ADB_KEY_TYPE_PROTO_HDRS})
- 
- target_include_directories(libadb_crypto_defaults PUBLIC
- 	core/adb
-@@ -173,7 +165,8 @@ add_executable(adb
- 	  core/adb/transport_fd.cpp
- 	  core/adb/client/transport_local.cpp
- 	  core/adb/client/transport_usb.cpp
--	  core/adb/types.cpp)
-+	  core/adb/types.cpp
-+	  ${ADB_KEY_TYPE_PROTO_HDRS})
- 
- target_compile_definitions(adb PRIVATE
- 	-DPLATFORM_TOOLS_VERSION="${ANDROID_VERSION}"
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index b394a98c10b..8d95b870e05 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=30.0.5
-revision=2
+version=30.0.5p1
+revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=1b870a3f28d75e4907c95dbe8e71b4014f56be636d089a75257ef3922ad39d62
+checksum=8400387db0ff3c7d030418b9f63ea171917c26e6bcc82d9dc666c8c4c02e9806
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"