diff options
| -rw-r--r-- | android/source/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/source/build.gradle | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index 037363163041..54ab1d4ba7c0 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -12,7 +12,9 @@ <application android:name=".LibreOfficeApplication" android:allowBackup="true" + android:extractNativeLibs="${extractNativeLibs}" android:icon="@mipmap/ic_launcher" + android:installLocation="${installLocation}" android:label="@string/app_name" android:theme="@style/LibreOfficeTheme" android:debuggable="true" diff --git a/android/source/build.gradle b/android/source/build.gradle index 92c6680f464a..1421f000de23 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -64,7 +64,6 @@ android { // 22 treats them as warnings, on 23 it is fatal error // ToDo: fix openssl stuff to not block targeting 23 or later targetSdkVersion 22 - manifestPlaceholders = [installLocation: "preferExternal"] vectorDrawables.useSupportLibrary = true } buildTypes { @@ -72,7 +71,12 @@ android { // make android studio happy... jniDebuggable true // would work just fine with external, but setting emulator up is a little more work - manifestPlaceholders = [installLocation: "internalOnly"] + manifestPlaceholders = [installLocation: "auto", extractNativeLibs: "false"] + } + release { + // need to extract native libs (allow to compress them in apk), since otherwise would + // exceed maximum size for playstore + manifestPlaceholders = [installLocation: "preferExternal", extractNativeLibs: "true"] } } productFlavors { |