Skip to content

Commit de91013

Browse files
committed
fix: export TOOLCHAIN_DIR so build-tags.sh subshell sees it
1 parent b3407b4 commit de91013

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/build-libtailscale-aar.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ jobs:
8686
ANDROID_NDK_HOME: ${{ env.ANDROID_HOME }}/ndk/25.2.9519653
8787
run: |
8888
mkdir -p android/libs
89-
# TOOLCHAIN_DIR must be non-empty to tell build-tags.sh we're using stock Go,
90-
# which makes it output "not_tailscale_go" instead of "tailscale_go".
91-
# "tailscale_go" pulls in code that calls runtime.TailscaleCurrentP, a symbol
92-
# that only exists in Tailscale's patched Go fork.
93-
TOOLCHAIN_DIR=$(go env GOROOT) BUILD_TAGS="$(./build-tags.sh) ts_omit_cachenetmap"
89+
# TOOLCHAIN_DIR must be non-empty so build-tags.sh outputs "not_tailscale_go"
90+
# instead of "tailscale_go". The "tailscale_go" tag pulls in code that uses
91+
# runtime.TailscaleCurrentP, a symbol only in Tailscale's patched Go fork.
92+
export TOOLCHAIN_DIR=$(go env GOROOT)
93+
BUILD_TAGS="$(./build-tags.sh) ts_omit_cachenetmap"
9494
gomobile bind \
9595
-target android \
9696
-androidapi 26 \

0 commit comments

Comments
 (0)