Enable chrome build by default

This commit makes build chrome targets by default and introduces
a build switch to disable the same with --disable-build-chrome

Removes the existing build switch --build-chrome

Also enables chrome build for desktop profile
Reference: https://review.tizen.org/gerrit/317781

Change-Id: Ib2d7defac1e4aead97d883b7678ec10d2a771d99
Signed-off-by: Gajendra N <gajendra.n@samsung.com>

diff --git a/chrome.sh b/chrome.sh
index c0bde565fa0dc3815b2fc2af199832f1515d03a6..1e19a171d85d73b59e952352fbffb70e4a87d742 100755 (executable)
--- a/chrome.sh
+++ b/chrome.sh
@@ -1,3 +1,3 @@
 export EVAS_GL_NO_BLACKLIST=1
 export LD_LIBRARY_PATH=$PWD/out.chrome.x64/Dependencies/Root/lib64/:$LD_LIBRARY_PATH
-./out.chrome.x64/chrome $1 --no-sandbox --ignore-gpu-blocklist --use-gl=egl --ozone-platform=efl --window-size=800,600
+./out.chrome.x64/chrome_tizen $1 --no-sandbox --ignore-gpu-blocklist --use-gl=egl --ozone-platform=efl --window-size=800,600

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 84b7a545605ec5f2fcd9b2a316211cff67d97ee8..43f66c72f4bd7a584d37358246c0e5abce5c2388 100644 (file)
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1414,7 +1414,7 @@ if (is_win) {
     group("chrome_dsym_archive") {
     }
   }
-} else if (is_tizen) {
+} else if (use_efl) {
   executable("chrome_tizen") {
     testonly = true
     deps = [ "//tizen_src/ewk/efl_integration:libchromium-ewk" ]
@@ -1427,7 +1427,9 @@ if (is_win) {
       "-Wl,--export-dynamic",
     ]
     cflags = [ "-fPIC" ]
-    configs += [ "//tizen_src/build/config/tizen:executable_config" ]
+    if (is_tizen) {
+      configs += [ "//tizen_src/build/config/tizen:executable_config" ]
+    }
   }
 
   static_library("chrome_lib") {

diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 4be49d673e1d98a3f332acea414ea269cba479de..0b5f039c3e04bdc20506e0edd94ded4e913cdcfd 100644 (file)
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -49,7 +49,7 @@ source_set("deprecated_experimental_mojo") {
     "socket.h",
   ]
 
-  if (is_chromeos || is_linux) {
+  if ((is_chromeos || is_linux) && !use_efl) {
     sources += [
       "bluez/metrics_recorder.cc",
       "bluez/metrics_recorder.h",

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 20e18cbcf25a3db1317a5251da293f3f9150fa74..c11c76b3d562c5fb43a5bb19de68fcf10708b613 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -1108,9 +1108,9 @@ rm -rf %{CHROMIUM_TPK_DIR}/%{_tpk_file_name}.tpk
   %{_libdir}/libchromium-ewk.so
   %{_libdir}/libtest_trace_processor.so
   %{_libdir}/libewebkit2.so*
-  %if 0%{?__enable_squashfs_image}
-    %if "%{?tizen_profile_name}" == "tv"
-       %{_bindir}/chromium-efl-install
+%if 0%{?__enable_squashfs_image}
+  %if "%{?tizen_profile_name}" == "tv"
+    %{_bindir}/chromium-efl-install
     %{_unitdir_user}/chromium-efl-vd.service
     %{_unitdir_user}/default.target.wants/chromium-efl-vd.service
     %dir %{CHROMIUM_LIB_UPGRADE_DIR}
@@ -1142,7 +1142,6 @@ rm -rf %{CHROMIUM_TPK_DIR}/%{_tpk_file_name}.tpk
 %endif
 
 %{CHROMIUM_LIB_DIR}/res/images/*.png
-
 %{CHROMIUM_LIB_DIR}/res/themes/*.edj
 %{CHROMIUM_LIB_DIR}/res/locale/*
 

diff --git a/tizen_src/build/BUILD.gn b/tizen_src/build/BUILD.gn
index f5ef36eb6126994b0014f8e5196d813a0a7fda6b..9484f230676dc8e4f71691eaa04321befebcfa3e 100644 (file)
--- a/tizen_src/build/BUILD.gn
+++ b/tizen_src/build/BUILD.gn
@@ -874,7 +874,10 @@ tizen_pkg_config("accessory") {
 }
 
 tizen_pkg_config("autoinput") {
-  packages = [ "autoinput" ]
+  packages = []
+  if (tizen_product_tv) {
+    packages = [ "autoinput" ]
+  }
 }
 
 if (enable_wrt_js) {

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 5ee67a51735237456de0e865d54b4b9e5796927d..d7982e6699dc2db5ad89120e9a984b77f83675b6 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -111,7 +111,7 @@ function parseHostBuildScriptParams() {
   export FORCE_JHBUILD=0
   export SKIP_NINJA=0
   export BUILD_EWK_UNITTESTS=0
-  export BUILD_CHROME=0
+  export BUILD_CHROME=1
   export BUILD_SUBDIRECTORY=Release
   export COMPONENT_BUILD=0
   export ENABLE_PEPPER_EXTENSIONS=0
@@ -135,8 +135,8 @@ function parseHostBuildScriptParams() {
       --gcc)
         export USE_CLANG=0
         ;;
-      --build-chrome)
-        export BUILD_CHROME=1
+      --disable-build-chrome)
+        export BUILD_CHROME=0
         ;;
       --force-jhbuild)
         export FORCE_JHBUILD=1
@@ -191,10 +191,9 @@ function hostNinja() {
   local RESULT=0
   if [[ $SKIP_NINJA == 0 ]]; then
     if [[ $BUILD_CHROME == 1 ]]; then
-      TARGETS="content_shell chrome"
-    else
-      TARGETS="chromium-ewk efl_webprocess efl_webview_app ubrowser"
+      TARGETS="chrome_tizen"
     fi
+    TARGETS="$TARGETS chromium-ewk efl_webprocess efl_webview_app ubrowser"
     if [[ $BUILD_EWK_UNITTESTS == 1 ]]; then
       TARGETS="$TARGETS ewk_unittests"
     fi
@@ -243,7 +242,7 @@ function setupAndExecuteTargetBuild() {
   local RELEASE_BUILD=0
   local MAKE_SQUASHFS_RPM=0
   local LOCAL_BUILD_JOBS=""
-  local BUILD_CHROME=0
+  local BUILD_CHROME=1
 
   # "|| :" means "or always succeeding built-in command"
   PROFILE=$(echo "$@" | grep -Po "(?<=\-P\s)[^\s]*" | head -1 || :)
@@ -317,9 +316,9 @@ function setupAndExecuteTargetBuild() {
     ;;
     --tizen*)
     ;;
-    --build-chrome)
-        BUILD_CHROME=1
-        ARGS+=(--define "_build_chrome 1")
+    --disable-build-chrome)
+        BUILD_CHROME=0
+        ARGS+=(--define "_build_chrome 0")
     ;;
     -j*)
         LOCAL_BUILD_JOBS="$1"

diff --git a/tizen_src/ewk/BUILD.gn b/tizen_src/ewk/BUILD.gn
index 6987ccc2b84f36514e7cdd099cf53ef217062bd3..638929e6453bf067dd5735b7808a3e132be0c07e 100644 (file)
--- a/tizen_src/ewk/BUILD.gn
+++ b/tizen_src/ewk/BUILD.gn
@@ -10,9 +10,6 @@ group("chromium_efl_all") {
     "//tizen_src/ewk/efl_webview_app:efl_webview_app",
     "//tizen_src/ewk/ubrowser:ubrowser",
   ]
-  if (build_chrome) {
-    deps += [ "//chrome:chrome" ]
-  }
   if (is_tizen) {
     deps += [ "//tizen_src/downloadable:chromium-efl-install" ]
   }

diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index 349c40e852dc7bdc902522414fb2940aa81815c5..cced6de386a45a093219db0db9159d862fffcac1 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -116,7 +116,7 @@ shared_library("chromium-ewk") {
     "//v8",
   ]
 
-  if (build_chrome && is_tizen) {
+  if (build_chrome) {
     deps += [ "//chrome:chrome_lib" ]
   }
   if (enable_printing) {