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

Change-Id: I4edbc9d3754fc8450119d0aa1596ba2a3946ff24
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index d23afeb..381a501 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -16,6 +16,13 @@ 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 92069f5..36d0abf 100644 (file)
--- a/build/tizen/web-engine-chromium/configure.ac
+++ b/build/tizen/web-engine-chromium/configure.ac
@@ -14,10 +14,12 @@ LT_INIT
 DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
-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)
+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
 
 devincludepath=${includedir}
 AC_SUBST(devincludepath)

diff --git a/build/tizen/web-engine-lite/configure.ac b/build/tizen/web-engine-lite/configure.ac
index 9ed046f..0c9d98d 100644 (file)
--- a/build/tizen/web-engine-lite/configure.ac
+++ b/build/tizen/web-engine-lite/configure.ac
@@ -14,9 +14,11 @@ LT_INIT
 DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
-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])
+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
 
 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 aa65481..550082d 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,3 +419,4 @@ 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 0ef0afd..b700930 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,3 +740,4 @@ 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 b1ffaa9..5284df1 100644 (file)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -74,8 +74,10 @@ 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
@@ -87,9 +89,11 @@ 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
@@ -126,6 +130,9 @@ autoreconf --install
 
 %configure --prefix=$PREFIX \
            --enable-ecore-wl2 \
+%ifarch %{arm}
+           --enable-web-engine-plugin \
+%endif
            --enable-keyextension
 
 make %{?jobs:-j%jobs}