refactor(ci): move release build logic into Makefile dist targets

Add dist, dist-jnictl-linux, dist-jnictl-android, dist-jniservice,
dist-dex targets to the root Makefile. The release workflow now calls
make dist with DIST_GOARCH instead of inline shell scripts.

Also fixes android/amd64 build failure (requires CGO_ENABLED=1 with
NDK cross-compiler for external linking).

Author: xaionaro@dx.center

.github/workflows/release.yml

@@ -14,13 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - goarch: arm64
-            android_abi: arm64-v8a
-            ndk_triple: aarch64-linux-android
-          - goarch: amd64
-            android_abi: x86_64
-            ndk_triple: x86_64-linux-android
+        goarch: [arm64, amd64]
 
     steps:
       - uses: actions/checkout@v4
@@ -42,46 +36,12 @@ jobs:
       - name: Install Android NDK and build-tools
         run: sdkmanager --install "ndk;27.0.12077973" "build-tools;35.0.0" "platforms;android-35"
 
-      - name: Build jnictl (linux)
+      - name: Build all artifacts
+        run: make dist
         env:
-          CGO_ENABLED: '0'
-          GOOS: linux
-          GOARCH: ${{ matrix.goarch }}
-        run: go build -o dist/jnictl-linux-${{ matrix.goarch }} ./cmd/jnictl/
-
-      - name: Build jnictl (android)
-        env:
-          CGO_ENABLED: '1'
-          GOOS: android
-          GOARCH: ${{ matrix.goarch }}
-          NDK_HOME: /usr/local/lib/android/sdk/ndk/27.0.12077973
-          CC_TRIPLE: ${{ matrix.ndk_triple }}
-        run: |
-          CC=$NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/${CC_TRIPLE}30-clang \
-          go build -o dist/jnictl-android-${{ matrix.goarch }} ./cmd/jnictl/
-
-      - name: Build jniservice shared library
-        env:
-          CGO_ENABLED: '1'
-          GOOS: android
-          GOARCH: ${{ matrix.goarch }}
-          NDK_HOME: /usr/local/lib/android/sdk/ndk/27.0.12077973
-          CC_TRIPLE: ${{ matrix.ndk_triple }}
-        run: |
-          CC=$NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/${CC_TRIPLE}30-clang \
-          go build -buildmode=c-shared \
-            -o dist/libjniservice-${{ matrix.android_abi }}.so \
-            ./cmd/jniservice/
-
-      - name: Compile Java wrapper and create classes.dex
-        env:
-          ANDROID_SDK_ROOT: /usr/local/lib/android/sdk
-        run: |
-          javac --release 17 -d dist cmd/jniservice/JNIService.java
-          $ANDROID_SDK_ROOT/build-tools/35.0.0/d8 \
-            --lib $ANDROID_SDK_ROOT/platforms/android-35/android.jar \
-            --output dist dist/JNIService.class
-          rm -f dist/JNIService.class
+          DIST_GOARCH: ${{ matrix.goarch }}
+          ANDROID_SDK: /usr/local/lib/android/sdk
+          DIST_NDK: /usr/local/lib/android/sdk/ndk/27.0.12077973
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

Makefile

@@ -1,4 +1,5 @@
-.PHONY: generate specs jni java proto protoc grpc cli clean lint test test-tools test-e2e test-emulator build build-server list-commands
+.PHONY: generate specs jni java proto protoc grpc cli clean lint test test-tools test-e2e test-emulator \
+	build build-server list-commands dist dist-jnictl-linux dist-jnictl-android dist-jniservice dist-dex
 
 # JDK detection for host tests (jni.h and libjvm.so).
 JDK_HOME ?= $(shell readlink -f $$(which javac) 2>/dev/null | sed 's|/bin/javac$$||')
@@ -102,3 +103,50 @@ test-e2e:
 # Full pipeline: build, push, start server, forward port, run tests, stop server.
 test-emulator:
 	$(MAKE) -C tests/e2e-grpc test
+
+# ---- Release artifacts ----
+# Usage: make dist GOARCH=arm64   (or GOARCH=amd64)
+# Builds all release artifacts into dist/.
+
+DIST_GOARCH ?= arm64
+ANDROID_SDK ?= $(HOME)/Android/Sdk
+DIST_NDK ?= $(shell ls -d $(ANDROID_SDK)/ndk/* 2>/dev/null | sort -V | tail -1)
+DIST_API_LEVEL ?= 30
+
+# Derive platform-specific values from GOARCH.
+ifeq ($(DIST_GOARCH),arm64)
+  DIST_NDK_TRIPLE := aarch64-linux-android
+  DIST_ANDROID_ABI := arm64-v8a
+else
+  DIST_NDK_TRIPLE := x86_64-linux-android
+  DIST_ANDROID_ABI := x86_64
+endif
+
+DIST_CC := $(DIST_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/$(DIST_NDK_TRIPLE)$(DIST_API_LEVEL)-clang
+
+# Build all release artifacts for a single GOARCH.
+dist: dist-jnictl-linux dist-jnictl-android dist-jniservice dist-dex
+
+dist-jnictl-linux:
+	@mkdir -p dist
+	CGO_ENABLED=0 GOOS=linux GOARCH=$(DIST_GOARCH) \
+		go build -o dist/jnictl-linux-$(DIST_GOARCH) ./cmd/jnictl/
+
+dist-jnictl-android:
+	@mkdir -p dist
+	CGO_ENABLED=1 GOOS=android GOARCH=$(DIST_GOARCH) CC=$(DIST_CC) \
+		go build -o dist/jnictl-android-$(DIST_GOARCH) ./cmd/jnictl/
+
+dist-jniservice:
+	@mkdir -p dist
+	CGO_ENABLED=1 GOOS=android GOARCH=$(DIST_GOARCH) CC=$(DIST_CC) \
+		go build -buildmode=c-shared \
+			-o dist/libjniservice-$(DIST_ANDROID_ABI).so ./cmd/jniservice/
+
+dist-dex:
+	@mkdir -p dist
+	javac --release 17 -d dist cmd/jniservice/JNIService.java
+	$(ANDROID_SDK)/build-tools/$$(ls $(ANDROID_SDK)/build-tools | sort -V | tail -1)/d8 \
+		--lib $$(ls -d $(ANDROID_SDK)/platforms/android-* | sort -V | tail -1)/android.jar \
+		--output dist dist/JNIService.class
+	rm -f dist/JNIService.class