diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2019-12-03 14:49:59 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-06-19 14:26:18 +0100 |
| commit | 2977df872f9ff29f69071195a929e95b873a1a78 (patch) | |
| tree | 26ea1f2c5f6da671738f6a38378ba801f9a7777a /external | |
| parent | 0bfff7e927acc7ea6b41896b5b37ec8be257b73b (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>
Diffstat (limited to 'external')
| -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 560623080c73..368b7a23668b 100644 --- a/external/nss/nss-android.patch.1 +++ b/external/nss/nss-android.patch.1 @@ -73,15 +73,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 |