diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2022-09-01 14:56:52 +0200 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2022-09-01 14:56:52 +0200 |
| commit | a65eac93eda03d5e3ab5ad279fd12cda2dd396c7 (patch) | |
| tree | d51a8eef5a97166e0e36b5ff8acf4f53d7bc7d67 | |
| parent | 47875ccb743e4ab7d89c8da0edf3bb27a484559b (diff) | |
| parent | 085d27feca5e484edeaf03539eb5aceeb8212178 (diff) | |
| download | mullvadvpn-a65eac93eda03d5e3ab5ad279fd12cda2dd396c7.tar.xz mullvadvpn-a65eac93eda03d5e3ab5ad279fd12cda2dd396c7.zip | |
Merge branch 'improve-android-buildscripts'
| -rw-r--r-- | android/gradle.properties | 2 | ||||
| -rwxr-xr-x | build-apk.sh | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/android/gradle.properties b/android/gradle.properties index 0f37cf9843..de2e2a73d1 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,4 @@ android.enableJetifier=true android.useAndroidX=true kotlin.code.style=official -org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" +org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M" diff --git a/build-apk.sh b/build-apk.sh index 8cc4e6ce76..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,10 +121,15 @@ 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" - $STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH" + + if [[ "$BUILD_TYPE" != "debug" ]]; then + $STRIP_TOOL --strip-debug --strip-unneeded -o "$TARGET_LIB_PATH" "$UNSTRIPPED_LIB_PATH" + else + cp "$UNSTRIPPED_LIB_PATH" "$TARGET_LIB_PATH" + fi done echo "Updating relays.json..." |