summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2023-11-29 11:34:39 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2023-11-30 12:17:30 +0100
commitc33c375b90ac6ec4d0d339486ac779d6d7b441e5 (patch)
treed1b498f1e4f49f2b68b97f19eaf12f40f19dcde5 /android
parentfa1f867caca9e5c6c0dbd4bcaf096f27077f363d (diff)
android: No longer extract native libs
As described in more detail in commit 45fbfbfeae1de12e87d0a3748e22553b69adbc4a Author: Michael Weghorn <m.weghorn@posteo.de> Date: Fri Mar 27 17:04:37 2020 +0100 tdf#131622 android: Extract native libs again , extracting native libraries was necessary for the NSS library to be able to load modules like `libnssckbi.so` at runtime. Without this, opening password-protected files would fail. However, this has in the meanwhile been addressed differently in the following commit (probably in the context of the online-based/Collabora Online app), so extracting libs is no longer needed: commit 16a7f98f99d334ea865b800e0b32d6fed1483942 Author: Mert Tumer <mert.tumer@collabora.com> Date: Wed Sep 30 17:14:59 2020 +0300 Fix libnssckbi not found error on Android This error causes Android App to be unable to open Password-protected documents. Change-Id: Iacbacb1c780025752e2447db325b075c58947818 Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103658 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com> Therefore, no longer extract the libraries, which also addresses addresses this warning shown during the build: > Task :processStrippedUIEditingDebugMainManifest .../android/source/AndroidManifest.xml:16:9-41 Warning: android:extractNativeLibs should not be specified in this source AndroidManifest.xml file. See https://d.android.com/guide/topics/manifest/application-element#extractNativeLibs for more information. The AGP Upgrade Assistant can remove the attribute from the AndroidManifest.xml file and update the build file accordingly. See https://d.android.com/studio/build/agp-upgrade-assistant for more information. Change-Id: I867beea0bce8398806375048e87a152e1348d016 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160079 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'android')
-rw-r--r--android/source/AndroidManifest.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml
index 9d1d309d7c9b..0a11a1d3654b 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -9,11 +9,9 @@
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <!-- extractNativeLibs="true" needed e.g. for NSS to load modules at runtime -->
<application
android:name=".LibreOfficeApplication"
android:allowBackup="true"
- android:extractNativeLibs="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/LibreOfficeTheme"