From 0458914167f71c6af236b735f619611200d6c4e3 Mon Sep 17 00:00:00 2001
From: Michael Tibben <michael.tibben@99designs.com>
Date: Tue, 18 Jan 2022 12:39:38 +1100
Subject: [PATCH] Remove android release build

---
 Makefile | 7 +------
 go.mod   | 1 -
 go.sum   | 2 --
 main.go  | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 686f55daf..f5b4275b3 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ install: aws-vault
 	rm -f $(INSTALL_DIR)/aws-vault
 	cp -a ./aws-vault $(INSTALL_DIR)/aws-vault
 
-binaries: aws-vault-linux-amd64 aws-vault-linux-arm64 aws-vault-linux-ppc64le aws-vault-linux-arm7 aws-vault-android-arm64 aws-vault-darwin-amd64 aws-vault-darwin-arm64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
+binaries: aws-vault-linux-amd64 aws-vault-linux-arm64 aws-vault-linux-ppc64le aws-vault-linux-arm7 aws-vault-darwin-amd64 aws-vault-darwin-arm64 aws-vault-windows-386.exe aws-vault-freebsd-amd64
 dmgs: aws-vault-darwin-amd64.dmg aws-vault-darwin-arm64.dmg
 
 clean:
@@ -28,7 +28,6 @@ clean:
 release: binaries dmgs SHA256SUMS
 
 	@echo "\nTo create a new release run:\n\n    gh release create --title $(VERSION) $(VERSION) \
-	aws-vault-android-arm64 \
 	aws-vault-darwin-amd64.dmg \
 	aws-vault-darwin-arm64.dmg \
 	aws-vault-freebsd-amd64 \
@@ -62,9 +61,6 @@ aws-vault-linux-ppc64le: $(SRC)
 aws-vault-linux-arm7: $(SRC)
 	GOOS=linux GOARCH=arm GOARM=7 go build $(BUILD_FLAGS) -o $@ .
 
-aws-vault-android-arm64: $(SRC)
-	GOOS=linux GOARCH=arm64 go build -tags='androiddnsfix' $(BUILD_FLAGS) -o $@ .
-
 aws-vault-windows-386.exe: $(SRC)
 	GOOS=windows GOARCH=386 go build $(BUILD_FLAGS) -o $@ .
 
@@ -76,7 +72,6 @@ aws-vault-darwin-arm64.dmg: aws-vault-darwin-arm64
 
 SHA256SUMS: binaries dmgs
 	shasum -a 256 \
-	  aws-vault-android-arm64 \
 	  aws-vault-darwin-amd64.dmg \
 	  aws-vault-darwin-arm64.dmg \
 	  aws-vault-freebsd-amd64 \
diff --git a/go.mod b/go.mod
index c0934ec1b..145a72205 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.14.0
 	github.com/google/go-cmp v0.5.6
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/mtibben/androiddnsfix v0.0.0-20200907095054-ff0280446354
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
diff --git a/go.sum b/go.sum
index 22fb0a25b..f25f97196 100644
--- a/go.sum
+++ b/go.sum
@@ -52,8 +52,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mtibben/androiddnsfix v0.0.0-20200907095054-ff0280446354 h1:aS4S9U7xE7bwYB6gn/X0BteBAasVEfQwPV5k8trGXW4=
-github.com/mtibben/androiddnsfix v0.0.0-20200907095054-ff0280446354/go.mod h1:Cu3Rcze2YUpuTWfggCBafY8U9/ckCksdAiONQ7XDvB8=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
 github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
diff --git a/main.go b/main.go
index 4f1c62c40..7e1f10fa5 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/99designs/aws-vault/v6/cli"
 	"github.com/alecthomas/kingpin"
-	_ "github.com/mtibben/androiddnsfix"
 )
 
 // Version is provided at compile time