[Tizen] Remove lwe build dependancy in DA profile 38/248338/1 accepted/tizen_6.0_unified tizen_6.0 accepted/tizen/6.0/unified/20201126.222222 submit/tizen_6.0/20201126.031245
authorJiyun Yang <ji.yang@samsung.com>
Wed, 25 Nov 2020 10:52:22 +0000 (19:52 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Wed, 25 Nov 2020 10:59:45 +0000 (19:59 +0900)
Change-Id: Id6a732b4172ff47c3debf70d733141a05598340e
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
build/tizen/web-engine-lwe/configure.ac
dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
packaging/dali-extension.spec

index bbd0d47d4e6bea7efff835ba40ba710c297f6811..8134c8b3d9415f1ce41a7b9f3a70eab3905c63db 100644 (file)
@@ -14,9 +14,18 @@ LT_INIT
 DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
+AC_ARG_WITH([da_profile],
+            [AC_HELP_STRING([--with-da-profile],
+                            [Use this conditional when use da profile])],
+            [with_da_profile=yes],
+            [with_da_profile=no])
+
 PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
+
+if test "x$with_da_profile" = "xno"; then
 PKG_CHECK_MODULES(WAYLAND, libtbm)
 PKG_CHECK_MODULES([WEB_ENGINE_LWE], [lightweight-web-engine-dali-plugin])
+fi
 
 devincludepath=${includedir}
 AC_SUBST(devincludepath)
index 91fe7222158873e8bed9f3a8c1c92de03cd01b94..306773127cf7a2d86436d61d3d683a66f7cd13ec 100644 (file)
@@ -15,6 +15,8 @@
  *
  */
 
+#ifndef DA_PROFILE
+
 // CLASS HEADER
 #include "tizen-web-engine-lwe.h"
 
@@ -806,3 +808,5 @@ bool TizenWebEngineLWE::SendKeyEvent( const Dali::KeyEvent& event )
 
 } // namespace Plugin
 } // namespace Dali
+
+#endif // DA_PROFILE
index 3f64e498cc1de7870678da095ad2fb22af8cfeb0..2c2dc64ac98333f8edbbf2b9dcbe519a35709e2e 100755 (executable)
@@ -148,7 +148,7 @@ Plugin to load color theme
 %package web-engine-lwe-plugin
 Summary:    Plugin to support WebView for Dali
 Group:      System/Libraries
-%if 0%{?tizen_55_or_greater}
+%if 0%{?tizen_55_or_greater} && "%{?_with_da_profile}" != "1"
 BuildRequires: pkgconfig(libtbm)
 BuildRequires: pkgconfig(lightweight-web-engine)
 %endif
@@ -185,6 +185,11 @@ CXXFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT"
 configure_flags="--enable-ecore-wl2"
 %endif
 
+%if "%{?_with_da_profile}" == "1"
+CFLAGS+=" -DDA_PROFILE"
+CXXFLAGS+=" -DDA_PROFILE"
+%endif
+
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
 autoreconf --install
@@ -195,6 +200,9 @@ autoreconf --install
 %endif
 %if 0%{?tizen_55_or_greater}
            --with-tizen-55-or-greater \
+%endif
+%if "%{?_with_da_profile}" == "1"
+           --with-da-profile \
 %endif
            --enable-ecore-wl2 \
            --enable-keyextension