From 99d00e803c9e4681e05da761a4bd4e365655a4e9 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 9 Nov 2020 17:03:58 +0100 Subject: [PATCH] Makefile: separate target for generating ipn.aar Signed-off-by: Elias Naur --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5b2c261..15fa4bb 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,11 @@ $(DEBUG_APK): (cd android && ./gradlew assemblePlayDebug) mv android/build/outputs/apk/play/debug/android-play-debug.apk $@ -$(RELEASE_AAB): +release_aar: mkdir -p android/libs go run gioui.org/cmd/gogio -ldflags "-X tailscale.com/version.Long=$(VERSION_LONG) -X tailscale.com/version.Short=$(VERSION_SHORT) -X tailscale.com/version.GitCommit=$(TAILSCALE_COMMIT)" -tags xversion -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale +$(RELEASE_AAB): release_aar (cd android && VERSION=$(VERSION_LONG) ./gradlew bundlePlayRelease) mv ./android/build/outputs/bundle/playRelease/android-play-release.aab $@ @@ -42,4 +43,4 @@ dockershell: clean: rm -rf android/build $(RELEASE_AAB) $(DEBUG_APK) $(AAR) -.PHONY: all clean install $(DEBUG_APK) $(RELEASE_AAB) release dockershell +.PHONY: all clean install $(DEBUG_APK) $(RELEASE_AAB) release_aar release dockershell