diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2022-08-25 13:41:47 +0200 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2022-09-01 14:29:37 +0200 |
| commit | f379418f659e2bb66206501ce8a94426865138f2 (patch) | |
| tree | f5d03962ebb28fe7c913cc15524dafd236919a3d | |
| parent | 47875ccb743e4ab7d89c8da0edf3bb27a484559b (diff) | |
| download | mullvadvpn-f379418f659e2bb66206501ce8a94426865138f2.tar.xz mullvadvpn-f379418f659e2bb66206501ce8a94426865138f2.zip | |
Don't strip daemon shared object in development builds
To help with debugging panics in the dameon, the dev builds shouldn't
strip the debug symbols from the shared object. However, doing this
blows up the gradle build so it's memory limit needs to be bumped too.
| -rw-r--r-- | android/gradle.properties | 2 | ||||
| -rwxr-xr-x | build-apk.sh | 7 |
2 files changed, 7 insertions, 2 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..0a95d2a851 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -123,7 +123,12 @@ for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do 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" - $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 "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH" + else + cp "$UNSTRIPPED_LIB_PATH" "$STRIPPED_LIB_PATH" + fi done echo "Updating relays.json..." |