From f8176b47a9e6c7d976808762cc5cc1f1a717210d Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sun, 19 Dec 2021 18:18:02 -0800 Subject: [PATCH] Makefile: remove long-obsolete -tags=xversion That build tag hasn't been used since tailscale/tailscale's 5088af68cf (June 2nd, 2021, for 1.10.0) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c229501..709cc98 100644 --- a/Makefile +++ b/Makefile @@ -54,12 +54,12 @@ $(DEBUG_APK): toolchain go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale (cd android && ./gradlew assemblePlayDebug) mv android/build/outputs/apk/play/debug/android-play-debug.apk $@ - + # This target is also used by the F-Droid builder. release_aar: toolchain release_aar: mkdir -p android/libs - go run gioui.org/cmd/gogio -ldflags "-X tailscale.com/version.Long=$(VERSIONNAME) -X tailscale.com/version.Short=$(VERSIONNAME_SHORT) -X tailscale.com/version.GitCommit=$(TAILSCALE_COMMIT) -X tailscale.com/version.ExtraGitCommit=$(OUR_VERSION)" -tags xversion -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale + go run gioui.org/cmd/gogio -ldflags "-X tailscale.com/version.Long=$(VERSIONNAME) -X tailscale.com/version.Short=$(VERSIONNAME_SHORT) -X tailscale.com/version.GitCommit=$(TAILSCALE_COMMIT) -X tailscale.com/version.ExtraGitCommit=$(OUR_VERSION)" -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale $(RELEASE_AAB): release_aar (cd android && ./gradlew bundlePlayRelease)