From 1331015ef8905aac3856fafb510db48ce638cb76 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Thu, 7 May 2020 17:27:45 +0900 Subject: [PATCH] Plugin so files renamed to provide DALi 2 Change-Id: Ic2946a671ff7ff8391fcefb75f80f57020e1d1e8 --- dali/internal/haptics/common/feedback-plugin-proxy.cpp | 6 +----- dali/internal/imaging/common/image-loader-plugin-proxy.cpp | 2 +- dali/internal/input/common/key-impl.cpp | 8 ++------ dali/internal/system/common/color-controller-impl.cpp | 2 +- .../common/vector-animation-renderer-plugin-proxy.cpp | 2 +- dali/internal/video/common/video-player-impl.cpp | 6 +----- dali/internal/web-engine/common/web-engine-impl.cpp | 4 ++-- 7 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dali/internal/haptics/common/feedback-plugin-proxy.cpp b/dali/internal/haptics/common/feedback-plugin-proxy.cpp index f8d7ce7..6829d21 100644 --- a/dali/internal/haptics/common/feedback-plugin-proxy.cpp +++ b/dali/internal/haptics/common/feedback-plugin-proxy.cpp @@ -31,11 +31,7 @@ namespace Internal namespace Adaptor { -#if _GLIBCXX_USE_CXX11_ABI -const char * const FeedbackPluginProxy::DEFAULT_OBJECT_NAME( "libdali-feedback-plugin.so" ); -#else -const char * const FeedbackPluginProxy::DEFAULT_OBJECT_NAME( "libdali-feedback-plugin-cxx03.so" ); -#endif +const char * const FeedbackPluginProxy::DEFAULT_OBJECT_NAME( "libdali2-feedback-plugin.so" ); FeedbackPluginProxy::FeedbackPluginProxy( const std::string& sharedObjectName ) : mInitializeAttempted( false ), diff --git a/dali/internal/imaging/common/image-loader-plugin-proxy.cpp b/dali/internal/imaging/common/image-loader-plugin-proxy.cpp index 1c61731..126754a 100755 --- a/dali/internal/imaging/common/image-loader-plugin-proxy.cpp +++ b/dali/internal/imaging/common/image-loader-plugin-proxy.cpp @@ -35,7 +35,7 @@ namespace ImageLoaderPluginProxy { -static const char * DEFAULT_OBJECT_NAME( "libdali-image-loader-plugin.so" ); +static const char * DEFAULT_OBJECT_NAME( "libdali2-image-loader-plugin.so" ); static bool mInitializeAttempted = false; static void* mLibHandle = NULL; diff --git a/dali/internal/input/common/key-impl.cpp b/dali/internal/input/common/key-impl.cpp index 30c6893..fe81d22 100644 --- a/dali/internal/input/common/key-impl.cpp +++ b/dali/internal/input/common/key-impl.cpp @@ -45,11 +45,7 @@ Debug::Filter* gKeyExtensionLogFilter = Debug::Filter::New(Debug::NoLogging, fal #endif // Path for loading extension keys -#if _GLIBCXX_USE_CXX11_ABI -const char* KEY_EXTENSION_PLUGIN_SO( "libdali-key-extension.so" ); -#else -const char* KEY_EXTENSION_PLUGIN_SO( "libdali-key-extension-cxx03.so" ); -#endif +const char* KEY_EXTENSION_PLUGIN_SO( "libdali2-key-extension.so" ); class KeyMap { @@ -213,7 +209,7 @@ class KeyMap if( mHandle == NULL ) { - DALI_LOG_INFO( gKeyExtensionLogFilter, Debug::General, "Failed to get handle from libdali-key-extension.so\n" ); + DALI_LOG_INFO( gKeyExtensionLogFilter, Debug::General, "Failed to get handle from libdali2-key-extension.so\n" ); return; } diff --git a/dali/internal/system/common/color-controller-impl.cpp b/dali/internal/system/common/color-controller-impl.cpp index c7630b2..242696d 100644 --- a/dali/internal/system/common/color-controller-impl.cpp +++ b/dali/internal/system/common/color-controller-impl.cpp @@ -35,7 +35,7 @@ namespace Adaptor namespace // unnamed namespace { -const char* COLOR_CONTROLLER_PLUGIN_SO( "libdali-color-controller-plugin.so" ); +const char* COLOR_CONTROLLER_PLUGIN_SO( "libdali2-color-controller-plugin.so" ); } Dali::ColorController ColorController::Get() diff --git a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp index 2a272c4..b2e2eac 100644 --- a/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp +++ b/dali/internal/vector-animation/common/vector-animation-renderer-plugin-proxy.cpp @@ -35,7 +35,7 @@ namespace { // The default plugin name -const char* DEFAULT_OBJECT_NAME( "libdali-vector-animation-renderer-plugin.so" ); +const char* DEFAULT_OBJECT_NAME( "libdali2-vector-animation-renderer-plugin.so" ); } diff --git a/dali/internal/video/common/video-player-impl.cpp b/dali/internal/video/common/video-player-impl.cpp index a431ecb..64ed46a 100755 --- a/dali/internal/video/common/video-player-impl.cpp +++ b/dali/internal/video/common/video-player-impl.cpp @@ -39,11 +39,7 @@ namespace Adaptor namespace // unnamed namespace { -#if _GLIBCXX_USE_CXX11_ABI -const char* VIDEO_PLUGIN_SO( "libdali-video-player-plugin.so" ); -#else -const char* VIDEO_PLUGIN_SO( "libdali-video-player-plugin-cxx03.so" ); -#endif +const char* VIDEO_PLUGIN_SO( "libdali2-video-player-plugin.so" ); Dali::BaseHandle Create() { diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp index a8c40b5..e467bb4 100644 --- a/dali/internal/web-engine/common/web-engine-impl.cpp +++ b/dali/internal/web-engine/common/web-engine-impl.cpp @@ -41,9 +41,9 @@ namespace Adaptor namespace // unnamed namespace { -constexpr char const * const kPluginFullNamePrefix = "libdali-web-engine-"; +constexpr char const * const kPluginFullNamePrefix = "libdali2-web-engine-"; constexpr char const * const kPluginFullNamePostfix = "-plugin.so"; -constexpr char const * const kPluginFullNameDefault = "libdali-web-engine-plugin.so"; +constexpr char const * const kPluginFullNameDefault = "libdali2-web-engine-plugin.so"; // Note: Dali WebView policy does not allow to use multiple web engines in an application. // So once pluginName is set to non-empty string, it will not change. -- 2.7.4