diff options
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 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 |