diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-05-24 14:57:34 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-05-27 20:18:05 +0000 |
| commit | 722661e38eb4f4e9fede282154fecc468dc62236 (patch) | |
| tree | 742cf018bf3426597e5eff73a2cc869ad7a2694c /.github | |
| parent | ed6a5327032e0367276c353263058c11d64a75ab (diff) | |
| download | mullvadvpn-722661e38eb4f4e9fede282154fecc468dc62236.tar.xz mullvadvpn-722661e38eb4f4e9fede282154fecc468dc62236.zip | |
Make architecture names standard
`build-apk.sh` and `wireguard/libwg/build-android.sh` were using
different names for the same architecture (x86/i686, arm/armv7,
arm64/aarch64). Making it consistent helps to reuse the same
`$ARCHITECTURES` environment variable for both scripts.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android-app.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index a9b1b0f270..14ce293258 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -86,7 +86,7 @@ jobs: NDK_TOOLCHAIN_DIR: ${{ steps.install-android-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin AR_x86_64_linux_android: ${{ steps.install-android-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar CC_x86_64_linux_android: ${{ steps.install-android-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang - ARCHITECTURES: arm64 x86_64 + ARCHITECTURES: aarch64 x86_64 run: | ./wireguard/build-wireguard-go.sh --android --no-docker source env.sh x86_64-linux-android |