Revert "[Tizen] Disable web engine plugin features when it is not arm arch"

This reverts commit 86c44a84e65d09902fa8dc1b8fc18ab7c46b58b2.

Change-Id: I90063c11a5d15e2f38f9a090edb67a297bd1743a

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 381a501..d23afeb 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -16,13 +16,6 @@ AC_SUBST(DALI_EXTENSION_VERSION)
 
 PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
 
-AC_ARG_ENABLE([web-engine-plugin],
-              [AC_HELP_STRING([--enable-web-engine-plugin], [enable web engine plugin features or not])],
-              [enable-web-engine-plugin=yes],
-              [enable-web-engine-plugin=no])
-
-AM_CONDITIONAL([ENABLE_WEB_ENGINE_PLUGIN], [test x$enable-web-engine-plugin = xyes])
-
 AC_CONFIG_SUBDIRS(key)
 AC_CONFIG_SUBDIRS(video-player)
 AC_CONFIG_SUBDIRS(web-engine-lite)

diff --git a/build/tizen/web-engine-chromium/configure.ac b/build/tizen/web-engine-chromium/configure.ac
index 36d0abf..92069f5 100644 (file)
--- a/build/tizen/web-engine-chromium/configure.ac
+++ b/build/tizen/web-engine-chromium/configure.ac
@@ -14,12 +14,10 @@ LT_INIT
 DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
-if test x$enable-web-engine-plugin = xyes; then
-  PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
-  PKG_CHECK_MODULES(WAYLAND, libtbm)
-  PKG_CHECK_MODULES(WEB_ENGINE_CHROMIUM, chromium-efl)
-  PKG_CHECK_MODULES(ELEMENTARY, elementary)
-fi
+PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
+PKG_CHECK_MODULES(WAYLAND, libtbm)
+PKG_CHECK_MODULES(WEB_ENGINE_CHROMIUM, chromium-efl)
+PKG_CHECK_MODULES(ELEMENTARY, elementary)
 
 devincludepath=${includedir}
 AC_SUBST(devincludepath)

diff --git a/build/tizen/web-engine-lite/configure.ac b/build/tizen/web-engine-lite/configure.ac
index 0c9d98d..9ed046f 100644 (file)
--- a/build/tizen/web-engine-lite/configure.ac
+++ b/build/tizen/web-engine-lite/configure.ac
@@ -14,11 +14,9 @@ LT_INIT
 DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
-if test x$enable-web-engine-plugin = xyes; then
-  PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
-  PKG_CHECK_MODULES(WAYLAND, libtbm)
-  PKG_CHECK_MODULES([WEB_ENGINE_LITE], [lightweight-web-engine-dali-plugin])
-fi
+PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
+PKG_CHECK_MODULES(WAYLAND, libtbm)
+PKG_CHECK_MODULES([WEB_ENGINE_LITE], [lightweight-web-engine-dali-plugin])
 
 devincludepath=${includedir}
 AC_SUBST(devincludepath)

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
index 550082d..aa65481 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-#ifdef ENABLE_WEB_ENGINE_PLUGIN
+
 #include <tizen-web-engine-chromium.h>
 
 #include <Ecore.h>
@@ -419,4 +419,3 @@ extern "C" EXPORT_API void DestroyWebEnginePlugin(Dali::WebEnginePlugin* plugin)
   if (plugin)
     delete plugin;
 }
-#endif

diff --git a/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp b/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp
index b700930..0ef0afd 100644 (file)
--- a/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp
+++ b/dali-extension/web-engine-lite/tizen-web-engine-lite.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-#ifdef ENABLE_WEB_ENGINE_PLUGIN
+
 // CLASS HEADER
 #include "tizen-web-engine-lite.h"
 
@@ -740,4 +740,3 @@ bool TizenWebEngineLite::SendKeyEvent( const Dali::KeyEvent& event )
 
 } // namespace Plugin
 } // namespace Dali
-#endif
\ No newline at end of file

diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec
index 5284df1..b1ffaa9 100644 (file)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -74,10 +74,8 @@ VideoPlayer plugin to play a video file for Dali
 %package web-engine-lite-plugin
 Summary:    Plugin to support WebView for Dali
 Group:      System/Libraries
-%ifarch %{arm}
 BuildRequires: pkgconfig(libtbm)
 BuildRequires: pkgconfig(lightweight-web-engine)
-%endif
 
 %description web-engine-lite-plugin
 Web Engine Lite plugin to support WebView for Dali
@@ -89,11 +87,9 @@ Web Engine Lite plugin to support WebView for Dali
 %package web-engine-chromium-plugin
 Summary:    Plugin to support WebView for Dali
 Group:      System/Libraries
-%ifarch %{arm}
 BuildRequires: pkgconfig(libtbm)
 BuildRequires: pkgconfig(chromium-efl)
 BuildRequires: pkgconfig(elementary)
-%endif
 
 %description web-engine-chromium-plugin
 Web Engine chromium plugin to support WebView for Dali
@@ -130,9 +126,6 @@ autoreconf --install
 
 %configure --prefix=$PREFIX \
            --enable-ecore-wl2 \
-%ifarch %{arm}
-           --enable-web-engine-plugin \
-%endif
            --enable-keyextension
 
 make %{?jobs:-j%jobs}