Enable chrome_tizen for desktop build

This commit enables chrome_tizen for desktop build as well.
With this change, default chrome target is now removed from
desktop build.

Change-Id: I3d4bc977bb20a4c5955e56d473729bded5230be2
Signed-off-by: Chandan Padhi <c.padhi@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 c27be8f798a843447423624b12b7475fd297e038..1ff2b63e34ddad6175d0d8f694bff4619ff8b264 100644 (file)
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1457,7 +1457,7 @@ if (is_win) {
     group("chrome_dsym_archive") {
     }
   }
-} else if (is_tizen) {
+} else if (use_efl) {
   browser_binary_name = "chrome_tizen"
   if (is_samsung_next_browser) {
     browser_binary_name = "next_browser"
@@ -1473,13 +1473,14 @@ if (is_win) {
       "-pie",
       "-Wl,--export-dynamic",
     ]
-    if(is_samsung_next_browser)
-    {
+    if (is_samsung_next_browser) {
       ldflags += [ "-Wl,-rpath=\$ORIGIN/../lib" ]
       defines = [ "SAMSUNG_NEXT_BROWSER" ]
     }
     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") {
@@ -1533,8 +1534,7 @@ if (is_win) {
 
     ldflags = []
 
-    if(is_samsung_next_browser)
-    {
+    if (is_samsung_next_browser) {
       defines = [ "SAMSUNG_NEXT_BROWSER" ]
     }
 

diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 847c3e922b64e60f13b1dd91aaf354ddcf9ff8ee..3e4035da322366b27d262d46953250803c178098 100644 (file)
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -46,13 +46,6 @@ source_set("deprecated_experimental_mojo") {
     "socket.h",
   ]
 
-  if (is_chromeos || is_linux) {
-    sources += [
-      "bluez/metrics_recorder.cc",
-      "bluez/metrics_recorder.h",
-    ]
-  }
-
   deps = [
     ":bluetooth",
     "//device/bluetooth/public/mojom:deprecated_experimental_interfaces",

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index cd61c8727e5d14ee742ede9169d70905a74c45c6..bf39591e6e7f69c8975cf0e92bb0e2d9cf213264 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -199,10 +199,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

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 6e24e3846180fd5109658b0b9b30861e97ae02fb..0e8a720d793b2255578c5a813a166b782a15b8b5 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -117,7 +117,7 @@ shared_library("chromium-ewk") {
     "//ui/views:test_support",
     "//v8",
   ]
-  if (build_chrome && is_tizen) {
+  if (build_chrome) {
     deps += [ "//chrome:chrome_lib" ]
   }
   if (enable_basic_printing) {
@@ -155,8 +155,8 @@ shared_library("chromium-ewk") {
     "-w",
   ]
 
-  if(is_samsung_next_browser) {
-  ldflags += [ "-Wl,-rpath=$app_samsung_next_browser_root_dir/lib" ]
+  if (is_samsung_next_browser) {
+    ldflags += [ "-Wl,-rpath=$app_samsung_next_browser_root_dir/lib" ]
   }
 
   if (is_tizen) {
@@ -786,10 +786,10 @@ shared_library("chromium-ewk") {
   }
 
   if (use_allocator_shim) {
-   deps += [
+    deps += [
       "//components/memory_system",
-      "//tizen_src/ewk/efl_integration/browser/profiling_host",
       "//tizen_src/chromium_impl/components/memory_system:memory_system_ewk",
+      "//tizen_src/ewk/efl_integration/browser/profiling_host",
     ]
   }