diff options
| author | cyberta <cyberta@riseup.net> | 2019-12-30 09:05:59 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2019-12-30 09:05:59 -0800 |
| commit | 699a68fffe39d46f6c35a7facc1fd846c92102d2 (patch) | |
| tree | 60096c9a7f44c159a4e1e37990cbc01a2398890a /go | |
| parent | b8ce7160704ce735422cc69cfa9fc646bfae7237 (diff) | |
| parent | 56c542d37f3fcaaa69ec8d6ef7014a8cc6dbaa06 (diff) | |
Merge branch 'rooted_firewall' into 'master'
firewall
Closes #8939
See merge request leap/bitmask_android!96
Diffstat (limited to 'go')
| -rwxr-xr-x | go/android_build_shapeshifter.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/go/android_build_shapeshifter.sh b/go/android_build_shapeshifter.sh index 7a884689..e39f9eb1 100755 --- a/go/android_build_shapeshifter.sh +++ b/go/android_build_shapeshifter.sh @@ -71,7 +71,7 @@ else # To remove targets, simply delete them from the bracket. # NOTE: We are only currently shipping the armeabi-v7a binary # on Android, for space reasons. - targets=(386 amd64 armv5 armv7 arm64) + targets=(386 x86_64 armv7 arm64) export GOOS=android for arch in ${targets[@]}; do @@ -86,7 +86,7 @@ else ndk_arch="x86" suffix="x86" binary="i686-linux-android-gcc" - elif [ "$arch" = "amd64" ]; then + elif [ "$arch" = "x86_64" ]; then ndk_platform="android-21" ndk_arch="x86_64" suffix="x86_64" |