diff options
| -rw-r--r-- | wireguard/libwg/Android.mk | 2 | ||||
| -rwxr-xr-x | wireguard/libwg/build-android.sh | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/wireguard/libwg/Android.mk b/wireguard/libwg/Android.mk index 76cc620139..cfbf5e3eb5 100644 --- a/wireguard/libwg/Android.mk +++ b/wireguard/libwg/Android.mk @@ -2,7 +2,7 @@ # # Copyright © 2017-2019 WireGuard LLC. All Rights Reserved. -DESTDIR ?= $(CURDIR)/../../android/build/extraJni/$(ANDROID_ABI) +DESTDIR ?= $(CURDIR)/../../build/lib/$(RUST_TARGET_TRIPLE) NDK_GO_ARCH_MAP_x86 := 386 NDK_GO_ARCH_MAP_x86_64 := amd64 diff --git a/wireguard/libwg/build-android.sh b/wireguard/libwg/build-android.sh index 9a699f0426..175ad49c5a 100755 --- a/wireguard/libwg/build-android.sh +++ b/wireguard/libwg/build-android.sh @@ -45,13 +45,9 @@ for arch in $ARCHITECTURES; do export CFLAGS="-D__ANDROID_API__=21" make -f Android.mk - # Copy build artifacts to `build/libs/$RUST_TARGET_TRIPLE` to be able to build `mullvad-jni` - chmod 777 ../../android/build/ - chmod 777 ../../android/build/extraJni - chmod 777 ../../android/build/extraJni/* - mkdir -p ../../build/lib/$RUST_TARGET_TRIPLE - cp ../../android/build/extraJni/$ANDROID_ABI/libwg.so ../../build/lib/$RUST_TARGET_TRIPLE - chmod 777 ../../android/build/extraJni/$ANDROID_ABI/libwg.so ../../build/lib/$RUST_TARGET_TRIPLE + # Copy build artifacts to `android/build/extraJni/$ANDROID_ABI` to be able to build the APK + mkdir -p ../../android/build/extraJni/$ANDROID_ABI + cp ../../build/lib/$RUST_TARGET_TRIPLE/libwg.so ../../android/build/extraJni/$ANDROID_ABI rm -rf build done |