[M85 Dev][Tizen] Fix for linker errors 56/244356/8
authoruzair <uzair.jaleel@samsung.com>
Thu, 17 Sep 2020 13:17:09 +0000 (18:47 +0530)
committerYoungsoo Choi <kenshin.choi@samsung.com>
Tue, 22 Sep 2020 06:34:37 +0000 (06:34 +0000)
Below change fixes linker error for standard
profile

Change-Id: If83c094064957b25a7325299be409433d0a577fd
Signed-off-by: uzair <uzair.jaleel@samsung.com>
19 files changed:
build/config/linux/BUILD.gn
content/browser/BUILD.gn
content/browser/speech/tts_platform_impl.cc
content/child/BUILD.gn
content/common/BUILD.gn
content/common/zygote/zygote_commands_linux.h
content/utility/BUILD.gn
content/utility/speech/BUILD.gn
content/zygote/BUILD.gn
device/fido/BUILD.gn
device/gamepad/BUILD.gn
media/capture/video/create_video_capture_device_factory.cc
packaging/chromium-efl.spec
third_party/blink/renderer/controller/BUILD.gn
tizen_src/build/gn_chromiumefl.sh
tizen_src/ewk/efl_webview_app/BUILD.gn
ui/base/clipboard/clipboard.cc
ui/color/BUILD.gn
ui/gfx/BUILD.gn

index fda1419..9c996ca 100644 (file)
@@ -80,19 +80,17 @@ config("libresolv") {
   libs = [ "resolv" ]
 }
 
-if (use_glib) {
-  pkg_config("glib") {
-    packages = [
-      "glib-2.0",
-      "gmodule-2.0",
-      "gobject-2.0",
-      "gthread-2.0",
-    ]
-    defines = [
-      "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40",
-      "GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40",
-    ]
-  }
+pkg_config("glib") {
+  packages = [
+    "glib-2.0",
+    "gmodule-2.0",
+    "gobject-2.0",
+    "gthread-2.0",
+  ]
+  defines = [
+    "GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40",
+    "GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40",
+  ]
 }
 
 # Ensures all exported symbols are added to the dynamic symbol table.  This is
index 20ac5d8..d028ee5 100644 (file)
@@ -2768,6 +2768,8 @@ jumbo_source_set("browser") {
       "sandbox_host_linux.h",
       "sandbox_ipc_linux.cc",
       "sandbox_ipc_linux.h",
+      "zygote_host/zygote_host_impl_linux.cc",
+      "zygote_host/zygote_host_impl_linux.h",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
index 2246c9f..532cfde 100644 (file)
@@ -4,6 +4,7 @@
 
 #include "content/browser/speech/tts_platform_impl.h"
 
+#include "base/logging.h"
 #include "build/build_config.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
@@ -30,6 +31,9 @@ TtsPlatform* TtsPlatform::GetInstance() {
   // if this is hit in something like a content-only unit test.
   NOTREACHED();
   return nullptr;
+#elif defined(OS_TIZEN)
+  LOG(ERROR) << " returning nullptr ";
+  return nullptr;
 #else
   return TtsPlatformImpl::GetInstance();
 #endif
index 0d2de24..ba30ad6 100644 (file)
@@ -141,6 +141,10 @@ target(link_target_type, "child") {
       "child_process_sandbox_support_impl_linux.cc",
       "child_process_sandbox_support_impl_linux.h",
     ]
+    deps += [
+      "//components/services/font/public/cpp",
+      "//components/services/font/public/mojom",
+    ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
index 74d81fe..b48753d 100644 (file)
@@ -335,7 +335,24 @@ source_set("common") {
 
   if (is_tizen) {
     set_sources_assignment_filter([])
-    sources += [ "common_sandbox_support_linux.cc" ]
+    sources += [
+      "common_sandbox_support_linux.cc",
+      "zygote/sandbox_support_linux.cc",
+      "zygote/send_zygote_child_ping_linux.cc",
+      "zygote/zygote_commands_linux.h",
+      "zygote/zygote_communication_linux.cc",
+      "zygote/zygote_communication_linux.h",
+    ]
+
+    deps += [ "//third_party/fontconfig" ]
+
+    if (use_zygote_handle) {
+      sources += [
+        "zygote/zygote_handle_impl_linux.h",
+        "zygote/zygote_handle_linux.cc",
+      ]
+    }
+
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
index 272b5b5..2bb08fd 100644 (file)
@@ -47,6 +47,14 @@ enum {
   // Not a real zygote command, but a subcommand used during the zygote fork
   // protocol.  Sends the child's PID as seen from the browser process.
   kZygoteCommandForkRealPID = 4
+#if defined(OS_TIZEN)
+  ,
+  // Load injected bundle library.
+  kZygoteCommandLoadInjectedBundle = 5,
+
+  // Drop privilege of zygote process.
+  kZygoteCommandDropProcessPrivileges = 6
+#endif
 };
 
 }  // namespace content
index 1b4d1dc..93033a0 100644 (file)
@@ -85,7 +85,7 @@ jumbo_source_set("utility") {
     deps += [ "//services/proxy_resolver:lib" ]
   }
 
-  if (is_linux) {
+  if (is_linux || is_tizen) {
     deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ]
   }
 
index 7a8ad15..6fd7840 100644 (file)
@@ -8,6 +8,15 @@ source_set("speech_recognition_sandbox_hook") {
     "speech_recognition_sandbox_hook_linux.h",
   ]
 
+  if (is_tizen) {
+    set_sources_assignment_filter([])
+    sources += [
+      "speech_recognition_sandbox_hook_linux.cc",
+      "speech_recognition_sandbox_hook_linux.h",
+    ]
+    set_sources_assignment_filter(sources_assignment_filter)
+  }
+
   deps = [
     "//base",
     "//components/component_updater:component_updater",
index 1673fc1..7f00a4b 100644 (file)
@@ -5,15 +5,16 @@
 import("//build/config/nacl/config.gni")
 import("//content/public/common/zygote/features.gni")
 
-if (is_linux) {
+if (is_linux || is_tizen) {
   source_set("zygote") {
+    set_sources_assignment_filter([])
     sources = [
       "zygote_linux.cc",
       "zygote_linux.h",
       "zygote_main.h",
       "zygote_main_linux.cc",
     ]
-
+    set_sources_assignment_filter(sources_assignment_filter)
     deps = [
       "//base",
       "//base:i18n",
index 4e5babd..686c8ba 100644 (file)
@@ -69,7 +69,7 @@ component("fido") {
   libs = []  # Extended for mac.
 
   # Android implementation of FIDO is delegated to GMSCore.
-  if (!is_android && !is_tizen) {
+  if (!is_android) {
     sources += [
       "attestation_object.cc",
       "attestation_object.h",
index 7fd582c..39f1bca 100644 (file)
@@ -130,6 +130,8 @@ component("gamepad") {
       "gamepad_platform_data_fetcher_linux.cc",
       "gamepad_platform_data_fetcher_linux.h",
       "gamepad_standard_mappings_linux.cc",
+      "hid_writer_linux.cc",
+      "hid_writer_linux.h",
       "udev_gamepad_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
index 18f519a..0fac885 100644 (file)
@@ -82,7 +82,7 @@ CreateChromeOSVideoCaptureDeviceFactory(
 std::unique_ptr<VideoCaptureDeviceFactory>
 CreatePlatformSpecificVideoCaptureDeviceFactory(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_TIZEN)
   return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
 #elif defined(OS_CHROMEOS)
   return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {});
index 6948a4b..276800b 100644 (file)
@@ -369,7 +369,6 @@ install -m 0755 "%{OUTPUT_FOLDER}"/libchromium-ewk.so    "%{buildroot}"%{_libdir
 
 install -m 0755 "%{OUTPUT_FOLDER}"/efl_webprocess    "%{buildroot}%{CHROMIUM_EXE_DIR}"
 install -m 0755 "%{OUTPUT_FOLDER}"/icudtl.dat    "%{buildroot}%{CHROMIUM_EXE_DIR}"
-install -m 0755 "%{OUTPUT_FOLDER}"/natives_blob.bin  "%{buildroot}%{CHROMIUM_EXE_DIR}"
 install -m 0755 "%{OUTPUT_FOLDER}"/snapshot_blob.bin "%{buildroot}%{CHROMIUM_EXE_DIR}"
 install -m 0644 "%{OUTPUT_FOLDER}"/content_shell.pak "%{buildroot}%{CHROMIUM_EXE_DIR}"
 install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj   "%{buildroot}%{CHROMIUM_DATA_DIR}"/themes
@@ -439,7 +438,6 @@ install -m 0755 tizen_src/ewk/utc_gtest_run.sh %{buildroot}/opt/usr/utc_exec/
 %{CHROMIUM_EXE_DIR}/efl_webprocess
 %endif
 %{CHROMIUM_EXE_DIR}/icudtl.dat
-%{CHROMIUM_EXE_DIR}/natives_blob.bin
 %{CHROMIUM_EXE_DIR}/snapshot_blob.bin
 %{CHROMIUM_EXE_DIR}/content_shell.pak
 %{CHROMIUM_EXE_DIR}/locales/*.pak
index c38a9a4..050bbea 100644 (file)
@@ -81,7 +81,7 @@ jumbo_component("controller") {
 
   # HighestPmfReporter depends on MemoryUsageMonitor and MemoryUsageMonitor
   # depends on platform specific code. Explicitly specify supported platforms.
-  if (is_linux || is_win || is_android || is_mac) {
+  if (is_linux || is_win || is_android || is_mac || is_tizen) {
     sources += [
       "highest_pmf_reporter.cc",
       "highest_pmf_reporter.h",
index e9598dd..c493575 100755 (executable)
@@ -158,6 +158,7 @@ add_emulator_flags() {
 
 add_tizen_flags() {
   ADDITIONAL_GN_PARAMETERS+="is_tizen=true
+                             use_zygote_handle=true
                              gcc_ver=\"$(getGccVersion)\"
                              python_ver=\"$(getPythonVersion)\"
                              is_official_build=true
index 879807c..56fbd63 100644 (file)
@@ -106,6 +106,8 @@ executable("mini_browser") {
       "//tizen_src/ewk/efl_integration:chromium-ewk",
     ]
 
+    # mini browser uses glibc apis
+    configs += [ "//build/config/linux:glib" ]
     if (!use_wayland) {
       configs += [ "//tizen_src/build:ecore-x" ]
       configs += [ "//tizen_src/build:libecore-x" ]
index a7722e2..21791a1 100644 (file)
@@ -9,6 +9,7 @@
 #include <memory>
 
 #include "base/check.h"
+#include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/notreached.h"
 #include "base/stl_util.h"
@@ -48,10 +49,13 @@ Clipboard* Clipboard::GetForCurrentThread() {
   auto it = clipboard_map->find(id);
   if (it != clipboard_map->end())
     return it->second.get();
-
+  LOG(ERROR) << " CLIPBOARDEFL BINGUP NEEEDS TO BE DONE";
+  return nullptr;
+#if !defined(EWK_BRINGUP)  // FIXME:m85 bringup
   Clipboard* clipboard = Clipboard::Create();
   clipboard_map->insert({id, base::WrapUnique(clipboard)});
   return clipboard;
+#endif
 }
 
 // static
index a39c290..45cd3d0 100644 (file)
@@ -83,6 +83,12 @@ jumbo_component("mixers") {
 
   public_deps = [ "//base" ]
 
+  if (is_tizen) {
+    set_sources_assignment_filter([])
+    sources += [ "linux/native_color_mixers.cc" ]
+    set_sources_assignment_filter(sources_assignment_filter)
+  }
+
   if (is_chromeos) {
     sources += [ "cros/native_color_mixers.cc" ]
   } else if (is_fuchsia) {
index 2431e86..41615c5 100644 (file)
@@ -424,7 +424,10 @@ jumbo_component("gfx") {
     set_sources_assignment_filter([])
     sources += [
       "font_fallback_linux.cc",
+      "font_fallback_linux.h",
       "font_render_params_linux.cc",
+      "linux/fontconfig_util.cc",
+      "linux/fontconfig_util.h",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }