From 27c45df3d5512dbe838c1d53f407bb51be8a975b Mon Sep 17 00:00:00 2001 From: Ernesto Castellotti Date: Thu, 24 Jan 2019 19:14:43 +0100 Subject: [PATCH] Set our packages name --- src/main/jni/CMakeLists.txt | 1 + src/main/jni/td_jni.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/jni/CMakeLists.txt b/src/main/jni/CMakeLists.txt index 4f1385d..4094fbf 100644 --- a/src/main/jni/CMakeLists.txt +++ b/src/main/jni/CMakeLists.txt @@ -13,6 +13,7 @@ add_library(tdjni SHARED td_jni.cpp ) +set(TD_API_JAVA_PACKAGE "it/ernytech/tdlib") target_include_directories(tdjni PRIVATE ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) target_link_libraries(tdjni PRIVATE Td::TdStatic ${JAVA_JVM_LIBRARY}) target_compile_definitions(tdjni PRIVATE PACKAGE_NAME="${TD_API_JAVA_PACKAGE}") diff --git a/src/main/jni/td_jni.cpp b/src/main/jni/td_jni.cpp index 8b3343b..e1acfe6 100644 --- a/src/main/jni/td_jni.cpp +++ b/src/main/jni/td_jni.cpp @@ -126,13 +126,13 @@ static jint register_native(JavaVM *vm) { reinterpret_cast(function_ptr)); }; - auto client_class = td::jni::get_jclass(env, PACKAGE_NAME "it/ernytech/tdlib/Client"); - log_class = td::jni::get_jclass(env, PACKAGE_NAME "it/ernytech/tdlib/Log"); - auto object_class = td::jni::get_jclass(env, PACKAGE_NAME "it/ernytech/tdlib/TdApi$Object"); - auto function_class = td::jni::get_jclass(env, PACKAGE_NAME "it/ernytech/tdlib/TdApi$Function"); + auto client_class = td::jni::get_jclass(env, PACKAGE_NAME "/Client"); + log_class = td::jni::get_jclass(env, PACKAGE_NAME "/Log"); + auto object_class = td::jni::get_jclass(env, PACKAGE_NAME "/TdApi$Object"); + auto function_class = td::jni::get_jclass(env, PACKAGE_NAME "/TdApi$Function"); -#define TD_OBJECT "L" PACKAGE_NAME "it/ernytech/tdlib/TdApi$Object;" -#define TD_FUNCTION "L" PACKAGE_NAME "it/ernytech/tdlib/TdApi$Function;" +#define TD_OBJECT "L" PACKAGE_NAME "/TdApi$Object;" +#define TD_FUNCTION "L" PACKAGE_NAME "/TdApi$Function;" register_method(client_class, "createNativeClient", "()J", Client_createNativeClient); register_method(client_class, "nativeClientSend", "(JJ" TD_FUNCTION ")V", Client_nativeClientSend); register_method(client_class, "nativeClientReceive", "(J[J[" TD_OBJECT "D)I", Client_nativeClientReceive);