Fix type and include ndk setup.mk

android/external/Makefile

@@ -43,7 +43,7 @@ else
 endif
 # include Android's build flags
 TARGET_ARCH_ABI = $(APP_ABI)
-#include $(ANDROID_NDK)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
+include $(ANDROID_NDK)/build/core/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 #include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk
 ANDROID_NDK_HOME=$(EXTERNAL_ROOT)/ndk-18-arm
 LD := $(ANDROID_NDK_HOME)/bin/$(HOST)-ld

src/basic_api.cc

@@ -14,7 +14,7 @@ extern "C" {
     using namespace pEp::JNIAdapter;
     using namespace pEp::Adapter;
 
-JNIEXPORT jobject JNICALL Java_foundation_pEp_jniadapter_Engine_trustwords(
+JNIEXPORT jbyteArray JNICALL Java_foundation_pEp_jniadapter_Engine_trustwords(
         JNIEnv *env,
         jobject obj,
         jobject ident