From cd6fe387afae774f4afdebb6e0bdc314cbc716dd Mon Sep 17 00:00:00 2001 From: Chandan Padhi Date: Thu, 28 Nov 2019 10:42:00 +0530 Subject: [PATCH] [M76 Dev][Tizen] Fix linker errors This commit resolves linker errors for tizen standard profile build. Change-Id: Ib9f14861602b279635ef22fbd154b9477a0b15c9 Signed-off-by: Chandan Padhi --- device/udev_linux/BUILD.gn | 9 --------- services/device/usb/BUILD.gn | 11 ++++++++++- third_party/blink/public/mojom/BUILD.gn | 2 +- third_party/blink/renderer/config.gni | 4 ++-- tizen_src/chromium_impl/ui/BUILD.gn | 1 + 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/device/udev_linux/BUILD.gn b/device/udev_linux/BUILD.gn index fd2fed6..a5ce061 100644 --- a/device/udev_linux/BUILD.gn +++ b/device/udev_linux/BUILD.gn @@ -20,15 +20,6 @@ if (use_udev) { "udev_watcher.h", ] - if (is_tizen) { - set_sources_assignment_filter([]) - sources += [ - "udev_linux.cc", - "udev_linux.h", - ] - set_sources_assignment_filter(sources_assignment_filter) - } - deps = [ "//base", "//build/linux/libudev", diff --git a/services/device/usb/BUILD.gn b/services/device/usb/BUILD.gn index 677a17e..71456fc 100644 --- a/services/device/usb/BUILD.gn +++ b/services/device/usb/BUILD.gn @@ -72,6 +72,15 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } + if (is_tizen && use_udev) { + set_sources_assignment_filter([]) + sources += [ + "usb_device_linux.cc", + "usb_service_linux.cc", + ] + set_sources_assignment_filter(sources_assignment_filter) + } + if (is_android) { deps += [ ":jni_headers" ] } else { @@ -111,7 +120,7 @@ static_library("usb") { ] } - if (is_android || is_chromeos || is_linux) { + if (is_android || is_chromeos || is_linux || is_tizen) { sources += [ "usb_device_handle_usbfs.cc", "usb_device_handle_usbfs.h", diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn index 1f6d785..bda8035 100644 --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn @@ -170,7 +170,7 @@ mojom("mojom_platform") { ] } - if (is_linux || is_chromeos) { + if (is_linux || is_tizen || is_chromeos) { enabled_features = [ "renderer_pref_system_font_family_name" ] } diff --git a/third_party/blink/renderer/config.gni b/third_party/blink/renderer/config.gni index a317a1f..14ea85b 100644 --- a/third_party/blink/renderer/config.gni +++ b/third_party/blink/renderer/config.gni @@ -17,7 +17,7 @@ declare_args() { # If true, use PFFFT for WebAudio FFT support. This can be used for # any Android architecture and also Linux and Windows. We only use # it on Android. - use_webaudio_pffft = is_android + use_webaudio_pffft = is_android || is_tizen } declare_args() { @@ -36,7 +36,7 @@ declare_args() { use_low_quality_image_interpolation = is_android # If true, ffmpeg will be used for computing FFTs for WebAudio - use_webaudio_ffmpeg = !is_mac && !is_android && !is_tizen && !use_webaudio_pffft + use_webaudio_ffmpeg = !is_mac && !is_android && !use_webaudio_pffft # If true, webgl2-compute context will be supported. support_webgl2_compute_context = !is_android && !is_tizen diff --git a/tizen_src/chromium_impl/ui/BUILD.gn b/tizen_src/chromium_impl/ui/BUILD.gn index 69c9246..d317980 100644 --- a/tizen_src/chromium_impl/ui/BUILD.gn +++ b/tizen_src/chromium_impl/ui/BUILD.gn @@ -23,6 +23,7 @@ static_library("ui_native_theme_inject") { ] deps = [ "//skia", + "//ui/base:buildflags", ] } -- 2.7.4