From 90381957ca51c4f10d96a57b59b6f68650008716 Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Thu, 1 Aug 2019 15:04:11 +0200
Subject: [PATCH] Fix type and include ndk setup.mk

---
 android/external/Makefile | 2 +-
 src/basic_api.cc          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/external/Makefile b/android/external/Makefile
index 7ed7ee9..9dbabbf 100644
--- a/android/external/Makefile
+++ b/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
diff --git a/src/basic_api.cc b/src/basic_api.cc
index 082a23a..d79280a 100644
--- a/src/basic_api.cc
+++ b/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