diff options
Diffstat (limited to 'Software/Android_Studio')
3 files changed, 14 insertions, 13 deletions
diff --git a/Software/Android_Studio/Tango.NativeBridge/CMakeLists.txt b/Software/Android_Studio/Tango.NativeBridge/CMakeLists.txt index aa766bc15..4e56698ac 100644 --- a/Software/Android_Studio/Tango.NativeBridge/CMakeLists.txt +++ b/Software/Android_Studio/Tango.NativeBridge/CMakeLists.txt @@ -1,15 +1,16 @@ cmake_minimum_required(VERSION 3.4.1) +file(GLOB_RECURSE SOURCES +../../Visual_Studio/Native/Tango.ColorLib/*.c +../../Visual_Studio/Native/Tango.ColorLib/*.cpp +) + +list(FILTER SOURCES EXCLUDE REGEX ".*Exports.cpp$") + add_library(colorLibAdapter SHARED - src/main/cpp/ColorLibAdapter.cpp - ../../Visual_Studio/Native/Tango.ColorLib/Tester.cpp - ../../Visual_Studio/Native/Tango.ColorLib/protobuf-c/protobuf-c.c - ../../Visual_Studio/Native/Tango.ColorLib/PMR/Common/ErrorCode.pb-c.c - ../../Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageContainer.pb-c.c - ../../Visual_Studio/Native/Tango.ColorLib/PMR/Common/MessageType.pb-c.c - ../../Visual_Studio/Native/Tango.ColorLib/PMR/Stubs/CalculateRequest.pb-c.c - ../../Visual_Studio/Native/Tango.ColorLib/PMR/Stubs/CalculateResponse.pb-c.c) + ${SOURCES} + src/main/cpp/ColorLibAdapter.cpp) find_library(log-lib log) diff --git a/Software/Android_Studio/Tango.NativeBridge/build.gradle b/Software/Android_Studio/Tango.NativeBridge/build.gradle index eaa5f5c3f..e14a0edf0 100644 --- a/Software/Android_Studio/Tango.NativeBridge/build.gradle +++ b/Software/Android_Studio/Tango.NativeBridge/build.gradle @@ -14,7 +14,7 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { - cppFlags "-std=c++11 -frtti -fexceptions" + cppFlags "-std=c++11 -frtti -fexceptions -fdeclspec" } } } diff --git a/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp b/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp index b0b641591..b2c5f3121 100644 --- a/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp +++ b/Software/Android_Studio/Tango.NativeBridge/src/main/cpp/ColorLibAdapter.cpp @@ -1,21 +1,21 @@ #include <jni.h> #include <string> -#include "Tester.h" +#include "ColorConverter.h" -using Tango::ColoLib::Tester; +using Tango::ColorLib::ColorConverter; extern "C" JNIEXPORT jbyteArray JNICALL Java_com_twine_tango_nativebridge_ColorLibAdapter_calculate(JNIEnv *env, jobject callingObject, jbyteArray request_buffer, jint request_buffer_size) { - Tester lib; + ColorConverter lib; uint8_t *responsePtr = NULL; uint8_t *dataPtr = (uint8_t *) env->GetByteArrayElements(request_buffer, JNI_FALSE); - jint size = lib.Calculate(dataPtr, (size_t) request_buffer_size, responsePtr); + jint size = lib.Convert(dataPtr, (size_t) request_buffer_size, responsePtr); jbyteArray response_array = env->NewByteArray(size); |