From 84e95268a60ab6e5fef013f3728b33b558c325e3 Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Tue, 13 Nov 2018 15:15:59 +0900 Subject: [PATCH] Revert "[Tizen] Support web engine selection using environment variable" This reverts commit ef1b8508ead0d096a31daf1d1df296c70f00f01b. --- .../internal/web-engine/common/web-engine-impl.cpp | 28 +--------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp index 0ef38d3..988462d 100644 --- a/dali/internal/web-engine/common/web-engine-impl.cpp +++ b/dali/internal/web-engine/common/web-engine-impl.cpp @@ -23,10 +23,6 @@ #include #include #include -#include - -// INTERNAL INCLUDES -#include namespace Dali { @@ -40,14 +36,7 @@ namespace Adaptor namespace // unnamed namespace { -#define DALI_ENV_WEB_ENGINE_NAME "DALI_WEB_ENGINE_NAME" - -const char* WEB_ENGINE_CHROMIUM_NAME( "chromium" ); -const char* WEB_ENGINE_LITE_NAME( "lightweight" ); - const char* WEB_ENGINE_PLUGIN_SO( "libdali-web-engine-plugin.so" ); -const char* WEB_ENGINE_CHROMIUM_PLUGIN_SO( "libdali-web-engine-chromium-plugin.so" ); -const char* WEB_ENGINE_LITE_PLUGIN_SO( "libdali-web-engine-lite-plugin.so" ); Dali::BaseHandle Create() { @@ -99,22 +88,7 @@ bool WebEngine::Initialize() { char* error = NULL; - const char* engineName = WEB_ENGINE_PLUGIN_SO; - const char* engineEnvName = EnvironmentVariable::GetEnvironmentVariable( DALI_ENV_WEB_ENGINE_NAME ); - - if ( engineEnvName ) - { - if( 0 == strcmp( engineEnvName, WEB_ENGINE_CHROMIUM_NAME ) ) - { - engineName = WEB_ENGINE_CHROMIUM_PLUGIN_SO; - } - else if( 0 == strcmp( engineEnvName, WEB_ENGINE_LITE_NAME ) ) - { - engineName = WEB_ENGINE_LITE_PLUGIN_SO; - } - } - - mHandle = dlopen( engineName, RTLD_LAZY ); + mHandle = dlopen( WEB_ENGINE_PLUGIN_SO, RTLD_LAZY ); error = dlerror(); if( mHandle == NULL || error != NULL ) -- 2.7.4