From c05301f6d2e3faa36e56590b3bf633d94f44f942 Mon Sep 17 00:00:00 2001
From: Chandan Padhi <c.padhi@samsung.com>
Date: Tue, 16 Oct 2018 22:08:23 -0700
Subject: [PATCH] [M69 Dev][EFL] Fix linker errors for desktop build

This resolves linker errors to enable EFL port.

Change-Id: I630683e412e6363732a9e8bd5b5d97cd6645160f
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
---
 content/browser/frame_host/render_frame_host_impl.cc | 3 ++-
 content/browser/gpu/gpu_process_host.cc              | 2 +-
 services/network/network_service.cc                  | 2 +-
 tizen_src/ewk/efl_integration/BUILD.gn               | 8 +++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 8e5af3e3..8680e2a 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3547,11 +3547,12 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
   // TODO(crbug.com/775792): Move to RendererInterfaceBinders.
   registry_->AddInterface(base::BindRepeating(
       &QuotaDispatcherHost::CreateForFrame, GetProcess(), routing_id_));
-
+#if !defined(USE_EFL)
   registry_->AddInterface(
       base::BindRepeating(SpeechRecognitionDispatcherHost::Create,
                           GetProcess()->GetID(), routing_id_),
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
+#endif
 }
 
 void RenderFrameHostImpl::ResetWaitingState() {
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index bdeccee..5c5898e 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -1286,7 +1286,7 @@ void GpuProcessHost::DidLoseContext(bool offscreen,
 }
 
 void GpuProcessHost::DisableGpuCompositing() {
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(USE_EFL)
   // TODO(crbug.com/819474): The switch from GPU to software compositing should
   // be handled here instead of by ImageTransportFactory.
   BrowserThread::PostTask(
diff --git a/services/network/network_service.cc b/services/network/network_service.cc
index c4df8ec..b1ce382 100644
--- a/services/network/network_service.cc
+++ b/services/network/network_service.cc
@@ -369,7 +369,7 @@ void NetworkService::UpdateSignedTreeHead(const net::ct::SignedTreeHead& sth) {
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) {
-#if !defined(IS_CHROMECAST)
+#if !defined(IS_CHROMECAST) && !defined(USE_EFL)
   auto config = std::make_unique<os_crypt::Config>();
   config->store = crypt_config->store;
   config->product_name = crypt_config->product_name;
diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index da35ee1..11a9a6f 100644
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -61,6 +61,7 @@ shared_library("chromium-ewk") {
     "//base/:base_static",
     "//components/autofill/content/browser",
     "//components/autofill/content/renderer",
+    "//components/error_page/common",
     "//components/network_session_configurator/browser",
     "//components/password_manager/content/browser",
     "//components/password_manager/core/browser",
@@ -93,7 +94,8 @@ shared_library("chromium-ewk") {
   defines = [ "CHROMIUM_VERSION=\"<!(python <(version_script) -f <(version_file) -t \"<(version_pattern)\")\"" ]
   ldflags = [
     "-Wl,--no-undefined",
-    "-Wl,--version-script="+ rebase_path("//tizen_src/ewk/chromium-ewk.filter")
+    "-Wl,--version-script=" +
+        rebase_path("//tizen_src/ewk/chromium-ewk.filter"),
   ]
   cflags = [
     # Symbol visibility controled by chromium-ewk.filter
@@ -490,14 +492,14 @@ shared_library("chromium-ewk") {
     "wrt/dynamicplugin.h",
     "wrt/v8widget.cc",
     "wrt/v8widget.h",
-    "wrt/wrtwidget.cc",
-    "wrt/wrtwidget.h",
     "wrt/wrt_dynamicplugin.cc",
     "wrt/wrt_dynamicplugin.h",
     "wrt/wrt_file_protocol_handler.cc",
     "wrt/wrt_file_protocol_handler.h",
     "wrt/wrt_widget_host.cc",
     "wrt/wrt_widget_host.h",
+    "wrt/wrtwidget.cc",
+    "wrt/wrtwidget.h",
   ]
 
   # FIXME: ewk_bringup definition should be removed.
-- 
2.7.4