From 4b592188bf7054e98e2f167e53bb5aedd88adbde Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Aug 2023 19:50:22 -0400
Subject: [PATCH] android-tools: correctly build with go1.20

Closes: #45771.
---
 srcpkgs/android-tools/patches/go1.20.patch | 11 -----------
 srcpkgs/android-tools/template             |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 srcpkgs/android-tools/patches/go1.20.patch

diff --git a/srcpkgs/android-tools/patches/go1.20.patch b/srcpkgs/android-tools/patches/go1.20.patch
deleted file mode 100644
index 69d6e6efd8f..00000000000
--- a/srcpkgs/android-tools/patches/go1.20.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vendor/boringssl/CMakeLists.txt
-+++ b/vendor/boringssl/CMakeLists.txt
-@@ -38,7 +38,7 @@
-   endif()
- else()
-   find_package(Perl REQUIRED)
--  find_program(GO_EXECUTABLE go)
-+  find_program(GO_EXECUTABLE NAMES go go1.20)
- endif()
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_CROSSCOMPILING)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 351bdfef88d..e3953233c2d 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -4,8 +4,7 @@ version=34.0.1
 revision=3
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
-configure_args="-DGO_EXECUTABLE=/usr/bin/go1.20"
-hostmakedepends="perl go1.20 protobuf pkg-config"
+hostmakedepends="perl go go1.20 protobuf pkg-config"
 makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
  liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 depends="python3"