Add use-wayland build switch for desktop build

Change-Id: If77274e44caf33cf3bdf857fe0f694be20c3f364
Signed-off-by: Insoon Kim <is46.kim@samsung.com>

diff --git a/tizen_src/build/BUILD.gn b/tizen_src/build/BUILD.gn
index 9484f230676dc8e4f71691eaa04321befebcfa3e..1a244c2a086206746774702c5d53b450de0cd332 100644 (file)
--- a/tizen_src/build/BUILD.gn
+++ b/tizen_src/build/BUILD.gn
@@ -432,7 +432,7 @@ tizen_pkg_config("security-privilege-manager") {
 
 tizen_pkg_config("tizen-extension-client") {
   packages = []
-  if (use_wayland) {
+  if (is_tizen && use_wayland) {
     packages = [ "tizen-extension-client" ]
   }
 }

diff --git a/tizen_src/build/build_desktop.sh b/tizen_src/build/build_desktop.sh
index d522c1af35bbf2659ab1667a428c0f904ddf96d9..4c0da11a65f565a4c1ce89dc26beb7b8e897227c 100755 (executable)
--- a/tizen_src/build/build_desktop.sh
+++ b/tizen_src/build/build_desktop.sh
@@ -56,13 +56,17 @@ export __GN_CHROMIUMEFL_TARGET=desktop
 export C_INCLUDE_PATH="${SCRIPTDIR}/desktop/tizen_include:$C_INCLUDE_PATH"
 export CPLUS_INCLUDE_PATH="${SCRIPTDIR}/desktop/tizen_include:$CPLUS_INCLUDE_PATH"
 
-__HOST_GN_ARG=""
-if [[ $USE_LOCAL_JHBUILD_DEPS == 1 ]]; then
+__HOST_GN_ARG=()
+if [ $USE_LOCAL_JHBUILD_DEPS == 1 ]; then
   buildLocalDepsWithJhbuild
   export LD_LIBRARY_PATH="${JHBUILD_DEPS}/${_LIBDIR}:$LD_LIBRARY_PATH"
   export PATH="${JHBUILD_DEPS}/bin:$PATH"
-  __HOST_GN_ARG="deps_include_path=\"${JHBUILD_DEPS}/include\" deps_lib_path=\"${JHBUILD_DEPS}/${_LIBDIR}\""
+  __HOST_GN_ARG+=("deps_include_path=\"${JHBUILD_DEPS}/include\"")
+  __HOST_GN_ARG+=("deps_lib_path=\"${JHBUILD_DEPS}/${_LIBDIR}\"")
 fi
-hostGnChromiumEfl $__HOST_GN_ARG
+if [[ -n "$USE_EFL_WAYLAND" ]]; then
+  __HOST_GN_ARG+=(use_wayland=${USE_EFL_WAYLAND})
+fi
+hostGnChromiumEfl "${__HOST_GN_ARG[@]}"
 
 hostNinja desktop

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 738441a573270bc2b4897373ff2dda99d869626e..e9fdce07a6b9c1885fc2989edf4ebfa15014581d 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -88,6 +88,7 @@ OPTIONS:
    -jN                   Set number of jobs, just like with make or ninja
    --skip-ninja          Skip ninja step
    --local-deps          Build using local dependency built by jhbuild
+   --use-wayland         Build with use_wayland build flag
 
 examples:
 $0 --ccache
@@ -117,6 +118,7 @@ function parseHostBuildScriptParams() {
   export BUILD_SUBDIRECTORY=Release
   export COMPONENT_BUILD=0
   export ENABLE_PEPPER_EXTENSIONS=0
+  export USE_EFL_WAYLAND=false
 
   local platform="$1"
   shift
@@ -164,6 +166,9 @@ function parseHostBuildScriptParams() {
       --enable-pepper-extensions)
         export ENABLE_PEPPER_EXTENSIONS=1
         ;;
+      --use-wayland)
+        export USE_EFL_WAYLAND=true
+        ;;
       -j*)
         export JOBS="$1"
         ;;

diff --git a/tizen_src/build/config/BUILD.gn b/tizen_src/build/config/BUILD.gn
index e502898c22ac54beb3bc0a262ea3a53cd9bb84e7..030abad819598b8a64cef89f40dc22d6c8c52651 100644 (file)
--- a/tizen_src/build/config/BUILD.gn
+++ b/tizen_src/build/config/BUILD.gn
@@ -26,6 +26,9 @@ config("tizen_feature_flags") {
   if (tizen_autofill) {
     defines += [ "TIZEN_AUTOFILL" ]
   }
+  if (use_wayland) {
+    defines += [ "USE_WAYLAND" ]
+  }
   if (is_tizen) {
     defines += [
       "OS_TIZEN",
@@ -33,9 +36,6 @@ config("tizen_feature_flags") {
       "TIZEN_VERSION_MINOR=${tizen_version_minor}",
       "TIZEN_VERSION_PATCH=${tizen_version_patch}",
     ]
-    if (use_wayland) {
-      defines += [ "USE_WAYLAND" ]
-    }
     if (tizen_tbm_support) {
       defines += [ "TIZEN_TBM_SUPPORT" ]
     }

diff --git a/tizen_src/build/config/compiler/BUILD.gn b/tizen_src/build/config/compiler/BUILD.gn
index b9b940e634de0ed32461b331dc5d7aa3e4c9ec42..5b15c3bd46d6b35261aabe4f9e838bcec5be7584 100644 (file)
--- a/tizen_src/build/config/compiler/BUILD.gn
+++ b/tizen_src/build/config/compiler/BUILD.gn
@@ -45,6 +45,8 @@ config("tizen_default_include_dirs") {
     "$deps_include_path/ecore-input-1",
     "$deps_include_path/ecore-input-evas-1",
     "$deps_include_path/ecore-ipc-1",
+    "$deps_include_path/ecore-wayland-1",
+    "$deps_include_path/ecore-wl2-1",
     "$deps_include_path/ecore-x-1",
     "$deps_include_path/ector-1",
     "$deps_include_path/ector-1/cairo",

diff --git a/tizen_src/build/gn_chromiumefl.sh b/tizen_src/build/gn_chromiumefl.sh
index 24ecd519c96d1e6186bcb356f71d50318d695dd6..18582e3268fde787d99b8d450a7480142c78609a 100755 (executable)
--- a/tizen_src/build/gn_chromiumefl.sh
+++ b/tizen_src/build/gn_chromiumefl.sh
@@ -146,8 +146,7 @@ add_desktop_flags() {
                              target_cpu=\"${host_arch}\"
                              target_os="\"linux\""
                              use_sysroot=false
-                             use_wayland=false
-                            use_plugin_placeholder_hole=true
+                             use_plugin_placeholder_hole=true
                              werror=false
                              dcheck_always_on=false
                              enable_nacl=false

diff --git a/tizen_src/build/jhbuild/jhbuild.modules b/tizen_src/build/jhbuild/jhbuild.modules
index 3ab7050609f108a460ca410d8eda929c729ee694..fcdf869b2904ea1f81cc4851b6046ab966d1e9fb 100644 (file)
--- a/tizen_src/build/jhbuild/jhbuild.modules
+++ b/tizen_src/build/jhbuild/jhbuild.modules
@@ -68,7 +68,7 @@
   <!-- The long and scary "enable-i-really" option is needed to build EFL with disable-pulseaudio and disable-physics options.
        Apparently EFL configure script considers such configuration unsupported. Still we don't need audio or physics support
        in EFL and building extra libraries just to satisfy dependencies we don't need is pointless. -->
-  <meson id="efl" mesonargs="-Dpulseaudio=false -Dbuild-examples=false -Dglib=true">
+  <meson id="efl" mesonargs="-Dpulseaudio=false -Dbuild-examples=false -Dglib=true -Dwl=true -Dwl-deprecated=true">
     <branch module="rel/libs/efl/efl-1.25.1.tar.xz" version="1.25.1"
             repo="download.enlightenment.org"
             hash="sha256:351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b">