external/nss/nss-android.patch.1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
New commits: commit 182d624efa51f2b633e2b9b43dc0772fb26a6e86 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Tue Dec 3 14:49:59 2019 +0100 Commit: Henry Castro <hcas...@collabora.com> CommitDate: Wed Jun 10 18:59:36 2020 +0200 nss: Fix Android build for x86 and x86_64 ... which previously failed with cd freebl; make libs error: unknown target CPU 'armv8-a' and cd freebl; make libs error: unknown target CPU 'armv8-a+crypto' respectively. Change-Id: Ib8a6bfc615c4fb15a1e5dd3e55bba187ff34a891 Reviewed-on: https://gerrit.libreoffice.org/84369 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95600 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Henry Castro <hcas...@collabora.com> diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1 index 4f10a009463c..c45a8b892391 100644 --- a/external/nss/nss-android.patch.1 +++ b/external/nss/nss-android.patch.1 @@ -60,15 +60,19 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk --- nss/nss/coreconf/arch.mk 2019-11-01 10:29:44.933245745 +0100 +++ nss/nss/coreconf/arch.mk 2019-11-01 10:32:04.347181076 +0100 -@@ -234,7 +234,11 @@ +@@ -234,7 +234,15 @@ # # this should be configurable from the user # - OS_TEST := arm -+ ifeq ($(USE_64),1) -+ OS_TEST := aarch64 ++ ifneq (,$(filter x86 x86_64,$(ANDROID_APP_ABI))) ++ OS_TEST := $(ANDROID_APP_ABI) + else -+ OS_TEST := arm ++ ifeq ($(USE_64),1) ++ OS_TEST := aarch64 ++ else ++ OS_TEST := arm ++ endif + endif OS_ARCH = Android ifndef OS_TARGET_RELEASE _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits