diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2019-12-03 14:49:59 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-10-10 09:14:43 +0200 |
| commit | bc4f22c5f35b7ee9c693c44e7cc2c839bd5470fb (patch) | |
| tree | 786be549d3315daabb7020f4a31c563b5806c2c6 | |
| parent | 90ae30e60ae1af474880dd5aa6b0bbc6fa174526 (diff) | |
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.stahl@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95600
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
| -rw-r--r-- | external/nss/nss-android.patch.1 | 12 |
1 files changed, 8 insertions, 4 deletions
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 |