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 | |
| 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.
| -rw-r--r-- | .github/workflows/android-app.yml | 2 | ||||
| -rwxr-xr-x | wireguard/libwg/build-android.sh | 15 |
2 files changed, 9 insertions, 8 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 diff --git a/wireguard/libwg/build-android.sh b/wireguard/libwg/build-android.sh index 3ed42af879..843102866f 100755 --- a/wireguard/libwg/build-android.sh +++ b/wireguard/libwg/build-android.sh @@ -10,37 +10,38 @@ cd $script_dir export GOPATH=$script_dir/../../build/android-go-path/ mkdir -p $GOPATH -ARCHITECTURES="${ARCHITECTURES:-"arm arm64 x86_64 x86"}" -for arch in $ARCHITECTURES; do +for arch in ${ARCHITECTURES:-armv7 aarch64 x86_64 i686}; do case "$arch" in - "arm64") + "aarch64") export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/aarch64-linux-android21-clang" export ANDROID_STRIP_TOOL="${NDK_TOOLCHAIN_DIR}/aarch64-linux-android-strip" export RUST_TARGET_TRIPLE="aarch64-linux-android" export ANDROID_ABI="arm64-v8a" + export ANDROID_ARCH_NAME="arm64" ;; "x86_64") export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/x86_64-linux-android21-clang" export ANDROID_STRIP_TOOL="${NDK_TOOLCHAIN_DIR}/x86_64-linux-android-strip" export RUST_TARGET_TRIPLE="x86_64-linux-android" export ANDROID_ABI="x86_64" + export ANDROID_ARCH_NAME="x86_64" ;; - "arm") + "armv7") export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/armv7a-linux-androideabi21-clang" export ANDROID_STRIP_TOOL="${NDK_TOOLCHAIN_DIR}/arm-linux-androideabi-strip" export RUST_TARGET_TRIPLE="armv7-linux-androideabi" export ANDROID_ABI="armeabi-v7a" + export ANDROID_ARCH_NAME="arm" ;; - "x86") + "i686") export ANDROID_C_COMPILER="${NDK_TOOLCHAIN_DIR}/i686-linux-android21-clang" export ANDROID_STRIP_TOOL="${NDK_TOOLCHAIN_DIR}/i686-linux-android-strip" export RUST_TARGET_TRIPLE="i686-linux-android" export ANDROID_ABI="x86" + export ANDROID_ARCH_NAME="x86" ;; esac - export ANDROID_ARCH_NAME=$arch - # Build Wireguard-Go echo $(pwd) make -f Android.mk clean |