c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: build miniooni and ooniprobe for android (#907)

Browse Source 
This diff introduces a build script, makefile rules, and github actions
rules to build and public android CLI releases.

See https://github.com/ooni/probe/issues/1723
This commit is contained in:
Simone Basso 2022-08-30 09:37:15 +02:00 committed by GitHub
parent 705589bbe1
commit d48d44b880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 101 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/android.yml vendored
View File

@ -36,13 +36,22 @@ jobs:
PSIPHON_CONFIG_JSON_AGE_BASE64: ${{ secrets.PSIPHON_CONFIG_JSON_AGE_BASE64 }}
- run: make ./MOBILE/android
- run: make ./CLI/android
- run: |
tag=$(echo $GITHUB_REF | sed 's|refs/tags/||g')
gh release create -p $tag --target $GITHUB_SHA || true
gh release upload $tag --clobber ./MOBILE/android/oonimkall.aar \
./MOBILE/android/oonimkall-sources.jar \
./MOBILE/android/oonimkall.pom
./MOBILE/android/oonimkall.pom \
./CLI/miniooni-android-386 \
./CLI/miniooni-android-amd64 \
./CLI/miniooni-android-arm \
./CLI/miniooni-android-arm64 \
./CLI/ooniprobe-android-386 \
./CLI/ooniprobe-android-amd64 \
./CLI/ooniprobe-android-arm \
./CLI/ooniprobe-android-arm64
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

77
CLI/go-build-android Executable file
View File

@ -0,0 +1,77 @@
#!/bin/bash
set -euo pipefail
if [[ $# -ne 2 ]]; then
echo "" 1>&2
echo "Compiler for a Go PACKAGE producing android/ANDROIDARCH binaries." 1>&2
echo "" 1>&2
echo "usage: $0 ANDROIDARCH PACKAGE" 1>&2
echo "" 1>&2
echo "ANDROIDARCH must be one of: 386, amd64, arm, arm64." 1>&2
echo "" 1>&2
echo "Features:" 1>&2
echo "" 1>&2
echo "* automatically sets -tags=ooni_psiphon_config when possible;" 1>&2
echo "" 1>&2
echo "* if GOLANG_EXTRA_FLAGS is set, pass it to the Go compiler." 1>&2
echo "" 1>&2
echo "Example:" 1>&2
echo "" 1>&2
echo " ./CLI/go-build-android arm ./internal/cmd/miniooni" 1>&2
echo "" 1>&2
exit 1
fi
GOOS=android
ANDROIDARCH=$1
PACKAGE=$2
if [[ -f ./internal/engine/psiphon-config.json.age &&
-f ./internal/engine/psiphon-config.key ]]; then
OONI_PSIPHON_TAGS=ooni_psiphon_config
else
OONI_PSIPHON_TAGS=""
fi
PRODUCT=$(basename $PACKAGE)
ANDROID_HOME=$(./MOBILE/android/home)
NDK_VERSION=$(cat NDKVERSION)
ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$NDK_VERSION
if [[ $ANDROIDARCH == arm ]]; then
GOARCH=arm
GOARM=7
CC=$(find $ANDROID_NDK_HOME -type f -name armv7a-linux-androideabi21-clang)
CXX=$(find $ANDROID_NDK_HOME -type f -name armv7a-linux-androideabi21-clang++)
elif [[ $ANDROIDARCH == arm64 ]]; then
GOARCH=$ANDROIDARCH
GOARM=
CC=$(find $ANDROID_NDK_HOME -type f -name aarch64-linux-android21-clang)
CXX=$(find $ANDROID_NDK_HOME -type f -name aarch64-linux-android21-clang++)
elif [[ $ANDROIDARCH == 386 ]]; then
GOARCH=$ANDROIDARCH
GOARM=
CC=$(find $ANDROID_NDK_HOME -type f -name i686-linux-android21-clang)
CXX=$(find $ANDROID_NDK_HOME -type f -name i686-linux-android21-clang++)
elif [[ $ANDROIDARCH == amd64 ]]; then
GOARCH=$ANDROIDARCH
GOARM=
CC=$(find $ANDROID_NDK_HOME -type f -name x86_64-linux-android21-clang)
CXX=$(find $ANDROID_NDK_HOME -type f -name x86_64-linux-android21-clang++)
else
echo "FATAL: invalid ANDROIDARCH: $ANDROIDARCH" 1>&2
exit 1
fi
set -x
export CC=$CC
export CXX=$CXX
export CGO_ENABLED=1
export GOOS=$GOOS
export GOARCH=$GOARCH
export GOARM=$GOARM
go build -tags=$OONI_PSIPHON_TAGS -ldflags="-s -w" \
-o ./CLI/$PRODUCT-$GOOS-$ANDROIDARCH ${GOLANG_EXTRA_FLAGS:-} \
$PACKAGE

14
Makefile
View File

@ -49,6 +49,20 @@ show-config:
@echo "GIT_CLONE_DIR=$(GIT_CLONE_DIR)"
@echo "OONI_PSIPHON_TAGS=$(OONI_PSIPHON_TAGS)"
#help:
#help: The `make ./CLI/android` command builds miniooni and ooniprobe for
#help: all the supported Android architectures.
.PHONY: ./CLI/android
./CLI/android: search/for/go search/for/android/sdk maybe/copypsiphon
./CLI/go-build-android 386 ./internal/cmd/miniooni
./CLI/go-build-android 386 ./cmd/ooniprobe
./CLI/go-build-android amd64 ./internal/cmd/miniooni
./CLI/go-build-android amd64 ./cmd/ooniprobe
./CLI/go-build-android arm ./internal/cmd/miniooni
./CLI/go-build-android arm ./cmd/ooniprobe
./CLI/go-build-android arm64 ./internal/cmd/miniooni
./CLI/go-build-android arm64 ./cmd/ooniprobe
#help:
#help: The `make ./CLI/miniooni` command builds the miniooni experimental
#help: command line client for all the supported GOOS/GOARCH.