From c1c201025ea655ea3f80bb19c3d700f45714f737 Mon Sep 17 00:00:00 2001 From: Sharaf Zaman Date: Mon, 12 Sep 2022 12:56:54 +0000 Subject: [PATCH] Android: Set TMPDIR to point to cache dir rather than a persistent dir Otherwise the app size keeps increasing. This is consistent with QStandardPaths::TempLocation. Fixes: QTBUG-98502 Change-Id: If4f0bd7a84443fe80a026b5f4443a38c32a7c836 Reviewed-by: Assam Boudjelthia (cherry picked from commit b8d51001f7d1c40cced642b4a1d990c90244706f) Reviewed-by: Qt Cherry-pick Bot --- .../jar/src/org/qtproject/qt/android/QtActivityDelegate.java | 2 +- .../jar/src/org/qtproject/qt/android/QtServiceDelegate.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java index 077c2ba79a9..2a00975aee5 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java @@ -721,7 +721,7 @@ public class QtActivityDelegate "Droid Sans Mono;Droid Sans;Droid Sans Fallback"); QtNative.setEnvironmentVariable("QT_ANDROID_FONTS_SERIF", "Droid Serif"); QtNative.setEnvironmentVariable("HOME", m_activity.getFilesDir().getAbsolutePath()); - QtNative.setEnvironmentVariable("TMPDIR", m_activity.getFilesDir().getAbsolutePath()); + QtNative.setEnvironmentVariable("TMPDIR", m_activity.getCacheDir().getAbsolutePath()); QtNative.setEnvironmentVariable("QT_ANDROID_FONTS", "Roboto;Droid Sans;Droid Sans Fallback"); QtNative.setEnvironmentVariable("QT_ANDROID_APP_ICON_SIZE", diff --git a/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java index 25e7fe500b9..0a4a314ec12 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java @@ -120,7 +120,7 @@ public class QtServiceDelegate "Droid Sans Mono;Droid Sans;Droid Sans Fallback"); QtNative.setEnvironmentVariable("QT_ANDROID_FONTS_SERIF", "Droid Serif"); QtNative.setEnvironmentVariable("HOME", m_service.getFilesDir().getAbsolutePath()); - QtNative.setEnvironmentVariable("TMPDIR", m_service.getFilesDir().getAbsolutePath()); + QtNative.setEnvironmentVariable("TMPDIR", m_service.getCacheDir().getAbsolutePath()); if (Build.VERSION.SDK_INT < 14) QtNative.setEnvironmentVariable("QT_ANDROID_FONTS", "Droid Sans;Droid Sans Fallback");