c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: repair the Android build (#905)

Browse source 
Rather than hardcoding the NDK version inside a script, encode it
as a file in the filesystem, which is easier to share.

Make sure we use the desired NDK by setting environment variables.

Use `-androidabi 21`, which:

1. is what rclone did: 8390ba4ca9

2. is the minimum ABI used by probe-android: 994651be52/app/build.gradle (L10)

Part of https://github.com/ooni/probe/issues/2130
This commit is contained in:
Simone Basso 2022-08-29 18:51:25 +02:00 • committed by GitHub
commit 42b547d311
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MOBILE/android/ensure
View file

@ -4,7 +4,7 @@ set -euo pipefail
__install_extra="build-tools;32.0.0 platforms;android-31"
__ndk_version="23.1.7779620"
__ndk_version=$(cat ./NDKVERSION)
ANDROID_HOME=$(./MOBILE/android/home)