diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2022-08-25 13:51:20 +0200 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2022-09-01 14:29:37 +0200 |
| commit | 085d27feca5e484edeaf03539eb5aceeb8212178 (patch) | |
| tree | d51a8eef5a97166e0e36b5ff8acf4f53d7bc7d67 | |
| parent | f379418f659e2bb66206501ce8a94426865138f2 (diff) | |
| download | mullvadvpn-085d27feca5e484edeaf03539eb5aceeb8212178.tar.xz mullvadvpn-085d27feca5e484edeaf03539eb5aceeb8212178.zip | |
Use CARGO_TARGET_DIR env variable
Using the environment variable in build-apk.sh allows one to use
arbitrary target directories. This helps with separate android target
directories for android build containers.
| -rwxr-xr-x | build-apk.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build-apk.sh b/build-apk.sh index 0a95d2a851..984f892268 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -16,6 +16,7 @@ FILE_SUFFIX="" CARGO_ARGS="--release" EXTRA_WGGO_ARGS="" BUILD_BUNDLE="no" +CARGO_TARGET_DIR=${CARGO_TARGET_DIR:-"target"} while [ ! -z "${1:-""}" ]; do if [[ "${1:-""}" == "--dev-build" ]]; then @@ -120,14 +121,14 @@ for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do cargo build $CARGO_ARGS --target "$TARGET" --package mullvad-jni STRIP_TOOL="${NDK_TOOLCHAIN_DIR}/${LLVM_TRIPLE}-strip" - STRIPPED_LIB_PATH="$SCRIPT_DIR/android/app/build/extraJni/$ABI/libmullvad_jni.so" - UNSTRIPPED_LIB_PATH="$SCRIPT_DIR/target/$TARGET/$BUILD_TYPE/libmullvad_jni.so" + TARGET_LIB_PATH="$SCRIPT_DIR/android/app/build/extraJni/$ABI/libmullvad_jni.so" + UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/$TARGET/$BUILD_TYPE/libmullvad_jni.so" if [[ "$BUILD_TYPE" != "debug" ]]; then - $STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH" + $STRIP_TOOL --strip-debug --strip-unneeded -o "$TARGET_LIB_PATH" "$UNSTRIPPED_LIB_PATH" else - cp "$UNSTRIPPED_LIB_PATH" "$STRIPPED_LIB_PATH" + cp "$UNSTRIPPED_LIB_PATH" "$TARGET_LIB_PATH" fi done |