diff --git a/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp b/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp index d5f09438..dde29cba 100644 --- a/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp +++ b/sources/jvxLibraries/jvx-flutter-native-static/src/flutter_native_boot_shutdown.cpp @@ -41,6 +41,7 @@ DartApiEntry_function FindFunctionPointer(const DartApiEntry* entries, return NULL; } +JVX_FLUTTER_LIB_BEGIN void InitDartApiDL(void* data) { DartApi* dart_api_data = (DartApi*)data; @@ -73,6 +74,7 @@ void InitDartApiDL(void* data) const DartApiEntry* it = dart_api_function_pointers; } +JVX_FLUTTER_LIB_END // ========================================================================= diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/CMakeLists.txt b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/CMakeLists.txt index c500107b..1fadeecc 100644 --- a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/CMakeLists.txt +++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/CMakeLists.txt @@ -94,6 +94,7 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE # This is the minimum package libs aggregation: ${AYF_CORE_PACK_LIB} + jvx-system-base_static ) target_compile_features(${PLUGIN_NAME} PRIVATE cxx_std_17) diff --git a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/ayfcorepack_plugin.cc b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/ayfcorepack_plugin.cc index 03348c74..19403bfc 100644 --- a/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/ayfcorepack_plugin.cc +++ b/sources/sub-projects/ayfstarter/flutter/ayf_starter_corepack/linux/ayfcorepack_plugin.cc @@ -1,5 +1,3 @@ -#include "ayf-sdk-local-headers.h" - #include "include/ayfcorepack/ayfcorepack_plugin.h" #include @@ -9,7 +7,8 @@ #include #include -extern std::string fileNameModule; +#include "../common/ayf-sdk-local-headers.h" +#include "jvx_platform.h" #define AYFCOREPACK_PLUGIN(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), ayfcorepack_plugin_get_type(), \ @@ -44,10 +43,10 @@ static void ayfcorepack_plugin_handle_method_call( g_autoptr(FlValue) mapReturn = fl_value_new_map(); //flutter::EncodableMap retMap; - std::string fNameModule = fileNameModule; - + std::string externalAccessModuleName = JVX_GET_CURRENT_MODULE_PATH((void*)flutter_config_open); fl_value_set(mapReturn, fl_value_new_string("loadedModule"), - fl_value_new_string("123"));//ayfcorepack::AyfcorepackPlugin::fileNameModule.c_str())); + fl_value_new_string(externalAccessModuleName.c_str())); + //ayfcorepack::AyfcorepackPlugin::fileNameModule.c_str())); // retMap[flutter::EncodableValue("loadedModule")] = flutter::EncodableValue(ayfcorepack::AyfcorepackPlugin::fileNameModule); fl_value_set(mapReturn, fl_value_new_string("moduleEntryAddress"), fl_value_new_int((intptr_t)flutter_config_open)); diff --git a/sources/sub-projects/ayfstarter/post_install/install_flutter_app.sh b/sources/sub-projects/ayfstarter/post_install/install_flutter_app.sh old mode 100644 new mode 100755