[M94 Dev][Tizen] Fix for errors for generating ninja files

This commit fixes gn related errors for generating
ninja files for compilation to begin for tizen port

Change-Id: I3f426149b283136124fcedeb80a4fec8b8296aaf
Signed-off-by: uzair <uzair.jaleel@samsung.com>

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 3571522..46b06cb 100644 (file)
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1265,7 +1265,7 @@ component("base") {
     ]
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "debug/proc_maps_linux.cc",
       "debug/proc_maps_linux.h",
@@ -2267,24 +2267,6 @@ component("base") {
     sources += [ "power_monitor/power_monitor_device_source_stub.cc" ]
   }
 
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [
-      "files/file_path_watcher_linux.cc",
-      "files/file_util_linux.cc",
-      "process/internal_linux.cc",
-      "process/internal_linux.h",
-      "process/memory_linux.cc",
-      "process/process_handle_linux.cc",
-      "process/process_iterator_linux.cc",
-      "process/process_linux.cc",
-      "process/process_metrics_linux.cc",
-      "system/sys_info_linux.cc",
-      "threading/platform_thread_linux.cc",
-    ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
-
   # On ARC++-enabled ChromeOS system, we need TimeTicks::FromUptimeMillis to
   # interpret time values sent from Android container.
   if (is_android || is_chromeos_ash) {

diff --git a/base/compiler_specific.h b/base/compiler_specific.h
index d53387f..84a4a9e 100644 (file)
--- a/base/compiler_specific.h
+++ b/base/compiler_specific.h
@@ -365,7 +365,8 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) {
 #endif  // defined(__clang_analyzer__)
 
 // Use nomerge attribute to disable optimization of merging multiple same calls.
-#if defined(__clang__) && __has_attribute(nomerge)
+// FIXME(M94) Need to remove OS_TIZEN macro
+#if defined(__clang__) && __has_attribute(nomerge) && !defined(OS_TIZEN)
 #define NOMERGE [[clang::nomerge]]
 #else
 #define NOMERGE

diff --git a/build/linux/unbundle/replace_gn_files.py b/build/linux/unbundle/replace_gn_files.py
index 4d8dab2..276e12d 100755 (executable)
--- a/build/linux/unbundle/replace_gn_files.py
+++ b/build/linux/unbundle/replace_gn_files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -80,7 +80,7 @@ def DoMain(argv):
         if not os.path.isdir(target_dir):
           try:
             os.makedirs(target_dir)
-          except OSError, e:
+          except OSError as e:
             if e.errno != errno.EEXIST:
               raise
 

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 8b2cf3c..3773cf6 100644 (file)
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -3036,21 +3036,6 @@ source_set("browser") {
     }
   }
 
-  if (is_tizen) {
-    sources += [
-      "child_process_launcher_helper_linux.cc",
-      "memory/swap_metrics_driver_impl_linux.cc",
-      "memory/swap_metrics_driver_impl_linux.h",
-      "renderer_host/pepper/pepper_truetype_font_linux.cc",
-      "sandbox_host_linux.cc",
-      "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",
-    ]
-  }
-
   if (enable_vr) {
     if (!is_android) {
       sources += [

diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index b9a3683..1716d64 100644 (file)
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -298,26 +298,6 @@ source_set("common") {
     }
   }
 
-  if (is_tizen) {
-    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",
-      ]
-    }
-  }
-
   if (is_mac) {
     sources += [
       "cursors/webcursor_mac.mm",
@@ -367,7 +347,7 @@ source_set("common") {
     sources -= [ "cursors/webcursor_aura.cc" ]
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "sandbox_init_linux.cc",
       "zygote/sandbox_support_linux.cc",
@@ -435,7 +415,7 @@ source_set("common") {
   }
 }
 
-if (is_linux || is_chromeos) {
+if (is_linux || is_chromeos || is_tizen) {
   source_set("set_process_title_linux") {
     public = [ "set_process_title_linux.h" ]
     sources = [ "set_process_title_linux.cc" ]

diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index a476102..fc0db3f 100644 (file)
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -207,7 +207,7 @@ target(link_target_type, "renderer") {
     ]
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [ "renderer_main_platform_delegate_linux.cc" ]
   }
 
@@ -586,13 +586,6 @@ target(link_target_type, "renderer") {
   if (use_efl) {
     sources += external_content_renderer_efl_sources
   }
-
-  if (is_tizen) {
-    sources += [
-      "render_view_linux.cc",
-      "renderer_main_platform_delegate_linux.cc",
-    ]
-  }
 }
 
 # See comment at the top of //content/BUILD.gn for how this works.

diff --git a/content/utility/speech/BUILD.gn b/content/utility/speech/BUILD.gn
index 71d9a2c..35b7a9f 100644 (file)
--- a/content/utility/speech/BUILD.gn
+++ b/content/utility/speech/BUILD.gn
@@ -8,13 +8,6 @@ source_set("speech_recognition_sandbox_hook") {
     "speech_recognition_sandbox_hook_linux.h",
   ]
 
-  if (is_tizen) {
-    sources += [
-      "speech_recognition_sandbox_hook_linux.cc",
-      "speech_recognition_sandbox_hook_linux.h",
-    ]
-  }
-
   deps = [
     "//base",
     "//components/component_updater:component_updater",

diff --git a/device/base/BUILD.gn b/device/base/BUILD.gn
index 51aad59..70cb67f 100644 (file)
--- a/device/base/BUILD.gn
+++ b/device/base/BUILD.gn
@@ -21,7 +21,7 @@ component("base") {
     "//device/vr/buildflags",
   ]
   deps = [ "//build:chromeos_buildflags" ]
-  if (use_udev) {
+  if (use_udev || is_tizen) {
     sources += [
       "device_monitor_linux.cc",
       "device_monitor_linux.h",
@@ -30,15 +30,6 @@ component("base") {
     deps += [ "//device/udev_linux" ]
   }
 
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [
-      "device_monitor_linux.cc",
-      "device_monitor_linux.h",
-    ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
-
   if (is_win) {
     sources += [
       "device_info_query_win.cc",

diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 8ad6567..2b70e85 100644 (file)
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -10,7 +10,7 @@ if (is_android) {
 }
 if (is_chromeos_ash) {
   import("//chromeos/dbus/use_real_dbus_clients.gni")
-} else if (use_dbus) {
+} else if (use_dbus && !is_tizen) {
   use_real_dbus_clients = false
 }
 
@@ -460,14 +460,12 @@ component("bluetooth") {
       }
 
       if (is_tizen) {
-        set_sources_assignment_filter([])
         sources += [
           "dbus/dbus_bluez_manager_wrapper_linux.cc",
           "dbus/dbus_bluez_manager_wrapper_linux.h",
           "dbus/dbus_thread_manager_linux.cc",
           "dbus/dbus_thread_manager_linux.h",
         ]
-        set_sources_assignment_filter(sources_assignment_filter)
       }
 
       if (!use_real_dbus_clients) {

diff --git a/device/gamepad/BUILD.gn b/device/gamepad/BUILD.gn
index d7afdc4..ff8813f 100644 (file)
--- a/device/gamepad/BUILD.gn
+++ b/device/gamepad/BUILD.gn
@@ -91,7 +91,7 @@ component("gamepad") {
         [ "/wd4267" ]  # conversion from 'size_t' (64 bit) to 'type'(32 bit).
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "gamepad_standard_mappings_linux.cc",
       "hid_writer_linux.cc",
@@ -113,20 +113,6 @@ component("gamepad") {
     }
   }
 
-  if (is_tizen && use_udev) {
-    set_sources_assignment_filter([])
-    sources += [
-      "gamepad_device_linux.cc",
-      "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)
-  }
-
   if (is_android) {
     sources += [
       "gamepad_platform_data_fetcher_android.cc",

diff --git a/gpu/ipc/service/BUILD.gn b/gpu/ipc/service/BUILD.gn
index 0c3194d..8764767 100644 (file)
--- a/gpu/ipc/service/BUILD.gn
+++ b/gpu/ipc/service/BUILD.gn
@@ -129,7 +129,7 @@ component("service") {
     ]
     libs += [ "android" ]
   }
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [ "image_transport_surface_linux.cc" ]
   }
   if (is_linux || is_chromeos || use_ozone) {
@@ -138,11 +138,6 @@ component("service") {
       "gpu_memory_buffer_factory_native_pixmap.h",
     ]
   }
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [ "image_transport_surface_linux.cc" ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
 
   if (use_x11) {
     sources += [ "x_util.h" ]

diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index 8a2378d..a318104 100644 (file)
--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
@@ -238,7 +238,7 @@ source_set("audio") {
     ]
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [ "linux/audio_manager_linux.cc" ]
   }
 
@@ -317,12 +317,6 @@ source_set("audio") {
       "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
     ]
   }
-
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [ "linux/audio_manager_linux.cc" ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
 }
 
 if (use_cras) {

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 276800b..068b3b6 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -1,7 +1,7 @@
 Name: chromium-efl
 Summary: Chromium EFL
 # Set by by scripts/update-chromium-version.sh
-%define ChromiumVersion 85.0.4183.93
+%define ChromiumVersion 94.0.4606.31
 %define Week 1
 Version: %{ChromiumVersion}.%{Week}
 Release: 1
@@ -49,7 +49,7 @@ Requires(postun): /sbin/ldconfig
 
 BuildRequires: binutils-gold
 BuildRequires: bison, edje-tools, expat-devel, flex, gettext, gperf, libcap-devel
-BuildRequires: libjpeg-turbo-devel, ninja, perl, python, python-xml, which
+BuildRequires: libjpeg-turbo-devel, ninja, perl, python3, python3-xml, which
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-location-manager)
 BuildRequires: pkgconfig(capi-media-audio-io)

diff --git a/services/network/BUILD.gn b/services/network/BUILD.gn
index 588a827..8d136c9 100644 (file)
--- a/services/network/BUILD.gn
+++ b/services/network/BUILD.gn
@@ -204,10 +204,6 @@ component("network_service") {
     ]
   }
 
-  if (is_tizen) {
-    sources += [ "network_sandbox_hook_linux.cc" ]
-  }
-
   if (is_chromeos_ash) {
     sources += [
       "cert_verifier_with_trust_anchors.cc",
@@ -291,7 +287,7 @@ component("network_service") {
   defines = [ "IS_NETWORK_SERVICE_IMPL" ]
 }
 
-if (is_linux || is_chromeos) {
+if (is_linux || is_chromeos || is_tizen) {
   source_set("network_sandbox_hook") {
     sources = [
       "network_sandbox_hook_linux.cc",

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index e3bf4bc..dfefcbd 100644 (file)
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -278,7 +278,7 @@ component("skia") {
   if (is_android) {
     sources += [ "ext/fontmgr_default_android.cc" ]
   }
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [ "ext/fontmgr_default_linux.cc" ]
   }
   if (is_ios) {
@@ -326,15 +326,6 @@ component("skia") {
     }
   }
 
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [
-      "ext/fontmgr_default_linux.cc",
-      "ext/fontmgr_default_linux.h",
-    ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
-
   if (is_win) {
     sources += [
       # Select the right BitmapPlatformDevice.

diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 980a979..dd00b81 100644 (file)
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1603,7 +1603,7 @@ component("platform") {
     ]
   }
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "fonts/linux/font_cache_linux.cc",
       "fonts/linux/font_unique_name_lookup_linux.cc",
@@ -1788,16 +1788,6 @@ component("platform") {
     sources += [ "fonts/fuchsia/font_cache_fuchsia.cc" ]
   }
 
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [
-      "fonts/linux/font_cache_linux.cc",
-      "fonts/linux/font_unique_name_lookup_linux.cc",
-      "text/linux/hyphenation_linux.cc",
-    ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
-
   if (use_minikin_hyphenation) {
     sources += [
       "text/hyphenation/hyphenation_minikin.cc",

diff --git a/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn b/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
index 27b40e0..1cec1f5 100644 (file)
--- a/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
+++ b/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
@@ -57,7 +57,7 @@ config("vulkan_internal_config") {
       "EXTRASYSCONFDIR=\"/pkg/data\"",
     ]
   }
-  if (is_linux || is_mac) {
+  if (is_linux || is_mac || is_tizen) {
     defines += [
       "SYSCONFDIR=\"/etc\"",
       "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index 58c431b..aa7fd08 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -3,7 +3,7 @@
 export SCRIPTDIR=$(readlink -e $(dirname $0))
 export TOPDIR=$(readlink -f "${SCRIPTDIR}/../..")
 export CHROME_SRC="${TOPDIR}"
-export LATEST_TIZEN_VERSION=6.0
+export LATEST_TIZEN_VERSION=6.5
 export DEFAULT_TIZEN_VERSION=$LATEST_TIZEN_VERSION
 
 if [ "$(echo "$@" | grep -e "--tizen")" != "" ]; then
@@ -60,7 +60,7 @@ function getGccVersion() {
 }
 
 function getPythonVersion() {
-  echo $(python --version  2>&1 | sed -e 's/Python \([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/')
+  echo $(python3 --version  2>&1 | sed -e 's/Python \([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/')
 }
 
 function setIfUndef() {

diff --git a/tizen_src/build/gn_chromiumefl b/tizen_src/build/gn_chromiumefl
index 8f9b37a..a5ab135 100755 (executable)
--- a/tizen_src/build/gn_chromiumefl
+++ b/tizen_src/build/gn_chromiumefl
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import glob
@@ -13,11 +13,11 @@ if chrome_src:
   chrome_src = os.path.abspath(chrome_src)
 if not chrome_src or not os.path.isdir(chrome_src):
   chrome_src = os.path.join(top_dir, '..')
-  print 'CHROME_SRC not set, falling back to ' + chrome_src
+  print ('CHROME_SRC not set, falling back to ' + chrome_src)
 
 script_dir = os.path.abspath(os.path.join(chrome_src, 'build'))
 if not os.path.isdir(script_dir):
-  print script_dir + " is not a valid directory"
+  print (script_dir + " is not a valid directory")
   sys.exit(1)
 
 sys.path.insert(0, script_dir)
@@ -125,7 +125,7 @@ if __name__ == '__main__':
   buildtools_path = os.environ.get('CHROMIUM_BUILDTOOLS_PATH')
   host_arch = os.environ.get('HOST_ARCH')
   if not buildtools_path:
-    print "build tool path is empty"
+    print ("build tool path is empty")
     sys.exit(1)
   else:
     if sys.platform.startswith(('cygwin', 'win')):
@@ -150,8 +150,8 @@ if __name__ == '__main__':
 
     gn_path = os.path.join(bin_path, 'gn' + exeSuffix)
     if not os.path.exists(gn_path):
-      print 'Could not find gn executable at: %s' % gn_path
+      print ('Could not find gn executable at: %s' % gn_path)
       sys.exit(2)
     else:
-      print 'Updating projects from gn files...'
+      print ('Updating projects from gn files...')
       sys.exit(subprocess.call([gn_path] + args[1:]))

diff --git a/tizen_src/build/gn_chromiumefl.sh b/tizen_src/build/gn_chromiumefl.sh
index cd1cce8..4ca6ccd 100755 (executable)
--- a/tizen_src/build/gn_chromiumefl.sh
+++ b/tizen_src/build/gn_chromiumefl.sh
@@ -176,6 +176,7 @@ add_tizen_flags() {
                              current_cpu=\"${host_arch}\"
                              host_cpu=\"${host_arch}\"
                              target_cpu=\"${host_arch}\"
+                             use_real_dbus_clients=false
                             "
 
   # FIXME : Note that the v8_snapshot_toolchain has been set to wrong

diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index 3b6862d..125203a 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//base/allocator/allocator.gni")
 import("//build/config/features.gni")
+import("//printing/buildflags/buildflags.gni")
 
 # [M48_2564] Temporary disabling the flag for switching to new chromium
 #            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15382
@@ -74,7 +75,6 @@ shared_library("chromium-ewk") {
     "//content/public/app",
     "//content/shell:pak",
     "//content/shell:resources",
-    "//printing",
     "//services/device:lib",
     "//skia",
     "//storage/browser",
@@ -90,6 +90,10 @@ shared_library("chromium-ewk") {
     "//v8",
   ]
 
+  if (enable_basic_printing) {
+    deps += [ "//printing" ]
+  }
+
   # TODO : needs to check for generating this macro define
   defines = [ "CHROMIUM_VERSION=\"<!(python <(version_script) -f <(version_file) -t \"<(version_pattern)\")\"" ]
   ldflags = [

diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 908a45e..8f7ce3e 100644 (file)
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -530,12 +530,6 @@ component("base") {
     deps += [ "//third_party/fontconfig" ]
   }
 
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [ "idle/idle_linux.cc" ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
-
   if (use_glib) {
     configs += [ "//build/config/linux:glib" ]
     sources += [
@@ -1176,7 +1170,8 @@ test("ui_base_unittests") {
     deps += [ "//ui/events:dom_keycode_converter" ]
   }
 
-  if (is_android || is_linux || is_chromeos || is_mac || is_win || is_fuchsia || is_tizen) {
+  if (is_android || is_linux || is_chromeos || is_mac || is_win || is_fuchsia ||
+      is_tizen) {
     # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
     # instead of depending directly on the non-test .pak files, but depending
     # on ui_test_pak seems to have no effect.

diff --git a/ui/color/BUILD.gn b/ui/color/BUILD.gn
index 1fb431e..a7b7dce 100644 (file)
--- a/ui/color/BUILD.gn
+++ b/ui/color/BUILD.gn
@@ -105,17 +105,11 @@ 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_ash) {
     sources += [ "cros/native_color_mixers.cc" ]
   } else if (is_fuchsia) {
     sources += [ "fuchsia/native_color_mixers.cc" ]
-  } else if (is_linux || is_chromeos) {
+  } else if (is_linux || is_chromeos || is_tizen) {
     sources += [ "linux/native_color_mixers.cc" ]
   } else if (is_mac) {
     frameworks = [ "AppKit.framework" ]

diff --git a/ui/events/devices/BUILD.gn b/ui/events/devices/BUILD.gn
index 49c1a09..5c086b9 100644 (file)
--- a/ui/events/devices/BUILD.gn
+++ b/ui/events/devices/BUILD.gn
@@ -27,7 +27,7 @@ component("devices") {
     "touchscreen_device.h",
   ]
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "device_util_linux.cc",
       "device_util_linux.h",
@@ -64,15 +64,6 @@ component("devices") {
     "//ui/gfx/geometry",
   ]
 
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [
-      "device_util_linux.cc",
-      "device_util_linux.h",
-    ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
-
   if (is_android) {
     deps += [ ":ui_events_devices_jni_headers" ]
   }

diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 5fb44bd..1818325 100644 (file)
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -171,7 +171,7 @@ component("gfx") {
       "android/view_configuration.h",
     ]
   }
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "font_fallback_linux.cc",
       "font_fallback_linux.h",
@@ -438,18 +438,6 @@ component("gfx") {
     configs += external_ui_gfx_configs
     sources += external_ui_gfx_sources
   }
-
-  if (is_tizen) {
-    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)
-  }
 }
 
 component("color_space") {

diff --git a/ui/shell_dialogs/BUILD.gn b/ui/shell_dialogs/BUILD.gn
index 3fc63fc..ff6e1f6 100644 (file)
--- a/ui/shell_dialogs/BUILD.gn
+++ b/ui/shell_dialogs/BUILD.gn
@@ -27,7 +27,7 @@ component("shell_dialogs") {
     "shell_dialogs_export.h",
   ]
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "shell_dialog_linux.cc",
       "shell_dialog_linux.h",
@@ -102,15 +102,6 @@ component("shell_dialogs") {
     sources += [ "select_file_dialog_fuchsia.cc" ]
   }
 
-  if (is_tizen) {
-    set_sources_assignment_filter([])
-    sources += [
-      "shell_dialog_linux.cc",
-      "shell_dialog_linux.h",
-    ]
-    set_sources_assignment_filter(sources_assignment_filter)
-  }
-
   # TODO(crbug.com/1052397): Rename is_chromeos_lacros.
   if (is_chromeos_lacros) {
     sources += [