From a527c2abedbeb4dc3e045e6f5ea7fe5bd206c992 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 25 Jun 2020 16:45:40 +0200 Subject: [PATCH] Makefile,android: shorten version environment variable Signed-off-by: Elias Naur --- Makefile | 2 +- android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b807e93..3d4bf88 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ aar: go run gioui.org/cmd/gogio -ldflags "-X tailscale.com/version.LONG=$(VERSION_LONG) -X tailscale.com/version.SHORT=$(VERSION_SHORT)" -tags xversion -buildmode archive -target android -appid $(APPID) -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale $(DEBUG_APK): aar - (cd android && VERSION_LONG=$(VERSION_LONG) ./gradlew assembleDebug) + (cd android && VERSION=$(VERSION_LONG) ./gradlew assembleDebug) mv android/build/outputs/apk/debug/android-debug.apk $@ $(RELEASE_AAB): aar diff --git a/android/build.gradle b/android/build.gradle index 5b7c310..2d80128 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,7 +26,7 @@ android { minSdkVersion 23 targetSdkVersion 29 versionCode 10 - versionName System.getenv("VERSION_LONG") + versionName System.getenv("VERSION") } compileOptions { sourceCompatibility 1.8