From bd0643b920ce1baf4275f343d9ffbd4824e077a0 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Wed, 29 Jul 2020 09:57:11 +0430 Subject: [PATCH] fix: lib name for android build --- 3rdparty/serializer | 2 +- test/common/nut-lib.pri | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/3rdparty/serializer b/3rdparty/serializer index 5b30b13..75807fe 160000 --- a/3rdparty/serializer +++ b/3rdparty/serializer @@ -1 +1 @@ -Subproject commit 5b30b13af9b9537d4226c922d04106dc4ba0595b +Subproject commit 75807feeb3cbc9dcae313cca7541e6011625b19f diff --git a/test/common/nut-lib.pri b/test/common/nut-lib.pri index d8b2f31..5c8f19b 100644 --- a/test/common/nut-lib.pri +++ b/test/common/nut-lib.pri @@ -1,8 +1,26 @@ win32 { CONFIG(debug,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/debug) CONFIG(release,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/release) + LIBS += -L$$LIBDIR -lnut } else { LIBDIR = $$absolute_path($$OUT_PWD/../../src) + android: { + + contains(ANDROID_TARGET_ARCH,armeabi-v7a) { + LIBS += -L$$LIBDIR -lnut_armeabi-v7a + } + contains(ANDROID_TARGET_ARCH,arm64-v8a) { + LIBS += -L$$LIBDIR -lnut_arm64-v8a + } + contains(ANDROID_TARGET_ARCH,x86) { + LIBS += -L$$LIBDIR -lnut_x86 + } + contains(ANDROID_TARGET_ARCH,x86_64) { + LIBS += -L$$LIBDIR -lnut_x86_64 + } + } else { + LIBS += -L$$LIBDIR -lnut + } } LIBS += -L$$LIBDIR -lnut