archive
/
tailscale-android
mirror of https://github.com/tailscale/tailscale-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Makefile: add tailscale_go to the set of build tags

Browse Source 
We build with the tailscale Go toolchain, so we should pass in the
build tag that indicates that it's safe to use functionality contained
within it.

Updates tailscale/corp#9230
pull/89/head^2
Mihai Parparita 1 year ago committed by Mihai Parparita
parent 8e4a740d8e
commit e7efa7d1c2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
Makefile
Unescape Escape View File

@ -52,7 +52,7 @@ endif
$(DEBUG_APK): toolchain $(DEBUG_APK): toolchain
mkdir -p android/libs mkdir -p android/libs
go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -tags novulkan -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -tags novulkan,tailscale_go -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale
(cd android && ./gradlew test assemblePlayDebug) (cd android && ./gradlew test assemblePlayDebug)
mv android/build/outputs/apk/play/debug/android-play-debug.apk $@ mv android/build/outputs/apk/play/debug/android-play-debug.apk $@
@ -65,7 +65,7 @@ rundebug: $(DEBUG_APK)
# This is useful for testing on e.g. Amazon Fire Stick devices. # This is useful for testing on e.g. Amazon Fire Stick devices.
tailscale-fdroid.apk: toolchain tailscale-fdroid.apk: toolchain
mkdir -p android/libs mkdir -p android/libs
go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -tags novulkan -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale go run gioui.org/cmd/gogio -buildmode archive -target android -appid $(APPID) -tags novulkan,tailscale_go -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale
(cd android && ./gradlew test assembleFdroidDebug) (cd android && ./gradlew test assembleFdroidDebug)
mv android/build/outputs/apk/fdroid/debug/android-fdroid-debug.apk $@ mv android/build/outputs/apk/fdroid/debug/android-fdroid-debug.apk $@
@ -73,7 +73,7 @@ tailscale-fdroid.apk: toolchain
release_aar: toolchain release_aar: toolchain
release_aar: release_aar:
mkdir -p android/libs mkdir -p android/libs
go run gioui.org/cmd/gogio -ldflags "-X tailscale.com/version.longStamp=$(VERSIONNAME) -X tailscale.com/version.shortStamp=$(VERSIONNAME_SHORT) -X tailscale.com/version.gitCommitStamp=$(TAILSCALE_COMMIT) -X tailscale.com/version.extraGitCommitStamp=$(OUR_VERSION)" -buildmode archive -target android -appid $(APPID) -tags novulkan -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale go run gioui.org/cmd/gogio -ldflags "-X tailscale.com/version.longStamp=$(VERSIONNAME) -X tailscale.com/version.shortStamp=$(VERSIONNAME_SHORT) -X tailscale.com/version.gitCommitStamp=$(TAILSCALE_COMMIT) -X tailscale.com/version.extraGitCommitStamp=$(OUR_VERSION)" -buildmode archive -target android -appid $(APPID) -tags novulkan,tailscale_go -o $(AAR) github.com/tailscale/tailscale-android/cmd/tailscale
$(RELEASE_AAB): release_aar $(RELEASE_AAB): release_aar
(cd android && ./gradlew test bundlePlayRelease) (cd android && ./gradlew test bundlePlayRelease)

Write Preview
Loading…
Cancel
Save