From: uzair Date: Thu, 10 Sep 2020 06:35:40 +0000 (+0530) Subject: [M85 Dev][Tizen] Fix for errors for generating ninja files X-Git-Tag: submit/tizen/20201118.160233~141 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F243799%2F5;p=platform%2Fframework%2Fweb%2Fchromium-efl.git [M85 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: I40f369bde2282948d7c09a12df12233d4aaa9f87 Signed-off-by: uzair --- diff --git a/build/config/linux/pkg-config.py b/build/config/linux/pkg-config.py index 5adf70c..aaa07b3 100755 --- a/build/config/linux/pkg-config.py +++ b/build/config/linux/pkg-config.py @@ -80,8 +80,8 @@ def GetPkgConfigPrefixToStrip(options, args): # from pkg-config's |prefix| variable. prefix = subprocess.check_output([options.pkg_config, "--variable=prefix"] + args, env=os.environ).decode('utf-8') - if prefix[-4] == '/usr': - return prefix[4:] + if prefix[-4:] == '/usr': + return prefix[:-4] return prefix diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 7c95bae..598d7256 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -2761,8 +2761,6 @@ jumbo_source_set("browser") { set_sources_assignment_filter([]) sources += [ "child_process_launcher_helper_linux.cc", - "memory/memory_monitor_linux.cc", - "memory/memory_monitor_linux.h", "memory/swap_metrics_driver_impl_linux.cc", "memory/swap_metrics_driver_impl_linux.h", "renderer_host/pepper/pepper_truetype_font_linux.cc", diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 6ac9a29..283d29b 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -611,19 +611,18 @@ if (is_fuchsia) { } } -group("telemetry_gpu_integration_test_scripts_only") { - testonly = true - deps = [ - "//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome", - ] +if (!use_efl) { + group("telemetry_gpu_integration_test_scripts_only") { + testonly = true + deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome" ] - data = [ - "//content/test/gpu/", - "//testing/scripts/run_isolated_script_test.py", - "//testing/test_env.py", - ] + data = [ + "//content/test/gpu/", + "//testing/scripts/run_isolated_script_test.py", + "//testing/test_env.py", + ] + } } - group("telemetry_gpu_integration_test_support") { testonly = true data = [ diff --git a/device/gamepad/BUILD.gn b/device/gamepad/BUILD.gn index f2623342..7fd582c 100644 --- a/device/gamepad/BUILD.gn +++ b/device/gamepad/BUILD.gn @@ -126,12 +126,10 @@ component("gamepad") { if (is_tizen && use_udev) { set_sources_assignment_filter([]) sources += [ - "dualshock4_controller_linux.cc", "gamepad_device_linux.cc", "gamepad_platform_data_fetcher_linux.cc", "gamepad_platform_data_fetcher_linux.h", "gamepad_standard_mappings_linux.cc", - "hid_haptic_gamepad_linux.cc", "udev_gamepad_linux.cc", ] set_sources_assignment_filter(sources_assignment_filter) diff --git a/net/BUILD.gn b/net/BUILD.gn index 07394e1..88713ee 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1234,7 +1234,7 @@ component("net") { ] } - if (is_linux) { + if (is_linux || is_tizen) { sources += [ "base/network_change_notifier_linux.cc", "base/network_change_notifier_linux.h", @@ -1243,7 +1243,7 @@ component("net") { ] } - if (is_linux || is_android) { + if (is_linux || is_android || is_tizen) { sources += [ "base/address_tracker_linux.cc", "base/address_tracker_linux.h", @@ -1472,19 +1472,6 @@ component("net") { } } - if (is_tizen) { - net_unfiltered_sources += [ - "base/address_tracker_linux.cc", - "base/address_tracker_linux.h", - "base/network_change_notifier_linux.cc", - "base/network_change_notifier_linux.h", - "base/network_interfaces_linux.cc", - "base/network_interfaces_linux.h", - "base/platform_mime_util_linux.cc", - "proxy_resolution/proxy_config_service_linux.cc", - ] - } - if (enable_unix_sockets) { sources += [ "socket/unix_domain_client_socket_posix.cc", diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec index b5fc91b..6b6583a 100644 --- 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 76.0.3809.146 +%define ChromiumVersion 85.0.4183.93 %define Week 1 Version: %{ChromiumVersion}.%{Week} Release: 1 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn index c5cffce5..740189f 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn @@ -123,6 +123,8 @@ group("make_platform_generated") { import("//build/config/pch.gni") config("blink_platform_config") { + visibility = [] # Allow re-assignment of list. + visibility = [ "./*" ] configs = [ "//third_party/blink/renderer:config", "//third_party/blink/renderer:inside_blink", @@ -200,10 +202,14 @@ buildflag_header("bindings_buildflags") { } config("blink_platform_implementation") { + visibility = [] + visibility = [ "./*" ] defines = [ "BLINK_PLATFORM_IMPLEMENTATION=1" ] } config("blink_platform_pch") { + visibility = [] + visibility = [ "./*" ] if (enable_precompiled_headers) { if (is_win) { # This is a string rather than a file GN knows about. It has to match diff --git a/third_party/dawn/src/common/BUILD.gn b/third_party/dawn/src/common/BUILD.gn index 59a2305..fbfca35 100644 --- a/third_party/dawn/src/common/BUILD.gn +++ b/third_party/dawn/src/common/BUILD.gn @@ -85,7 +85,7 @@ config("dawn_internal") { # Only internal Dawn targets can use this config, this means only targets in # this BUILD.gn file. - visibility = [ ":*" ] + visibility = [ "../*" ] cflags = [] # Enable more warnings that were found when using Dawn in other projects @@ -135,7 +135,7 @@ config("dawn_internal") { # This GN file is discovered by all Chromium builds, but common doesn't support # all of Chromium's OSes so we explicitly make the target visible only on # systems we know Dawn is able to compile on. -if (is_win || is_linux || is_mac || is_fuchsia || is_android) { +if (is_win || is_linux || is_mac || is_fuchsia || is_android || is_tizen) { static_library("common") { sources = [ "Assert.cpp", diff --git a/third_party/webrtc/BUILD.gn b/third_party/webrtc/BUILD.gn index 85e1bc1..f3e49ad 100644 --- a/third_party/webrtc/BUILD.gn +++ b/third_party/webrtc/BUILD.gn @@ -414,8 +414,9 @@ config("common_config") { } config("common_objc") { - libs = [ "Foundation.framework" ] - + if (!is_tizen) { + libs = [ "Foundation.framework" ] + } if (rtc_use_metal_rendering) { defines = [ "RTC_SUPPORTS_METAL" ] } diff --git a/tizen_src/chromium_impl/content/common/BUILD.gn b/tizen_src/chromium_impl/content/common/BUILD.gn index 6da0aba..42e0b06 100644 --- a/tizen_src/chromium_impl/content/common/BUILD.gn +++ b/tizen_src/chromium_impl/content/common/BUILD.gn @@ -5,7 +5,10 @@ import("//tizen_src/build/config/tizen_features.gni") config("content_common_efl") { - visibility = [ "//tizen_src/chromium_impl/content/common/common_efl.gni" ] + visibility = [ + "//tizen_src/chromium_impl/content/common/common_efl.gni", + "//content/*", + ] defines = [ "DATA_DIR=\"$tizen_data_dir\"", diff --git a/tizen_src/ewk/efl_webview_app/BUILD.gn b/tizen_src/ewk/efl_webview_app/BUILD.gn index 9423485..879807c 100644 --- a/tizen_src/ewk/efl_webview_app/BUILD.gn +++ b/tizen_src/ewk/efl_webview_app/BUILD.gn @@ -104,10 +104,8 @@ executable("mini_browser") { deps += [ "//tizen_src/chromium_impl/tizen:system-info", "//tizen_src/ewk/efl_integration:chromium-ewk", - - #"//build/linux:glib", removed from the chromium ] - configs += [ "//build/config/linux:glib" ] + if (!use_wayland) { configs += [ "//tizen_src/build:ecore-x" ] configs += [ "//tizen_src/build:libecore-x" ] diff --git a/tools/perf/chrome_telemetry_build/BUILD.gn b/tools/perf/chrome_telemetry_build/BUILD.gn index 853c3aa..6e066dc 100644 --- a/tools/perf/chrome_telemetry_build/BUILD.gn +++ b/tools/perf/chrome_telemetry_build/BUILD.gn @@ -12,124 +12,125 @@ if (is_chromeos) { } if (!is_tizen) { -group("telemetry_chrome_test") { - testonly = true + group("telemetry_chrome_test") { + testonly = true - data_deps = [ - ":telemetry_chrome_test_without_chrome", - "//third_party/perfetto/src/trace_processor:trace_processor_shell", - ] - data = [] - - if (is_android) { - data_deps += [ - ":telemetry_weblayer_apks", - "//android_webview/test:webview_instrumentation_apk", - "//chrome/android:chrome_public_apk", - "//chrome/android/webapk/shell_apk:maps_go_webapk", + data_deps = [ + ":telemetry_chrome_test_without_chrome", + "//third_party/perfetto/src/trace_processor:trace_processor_shell", ] + data = [] - if (enable_chrome_android_internal) { - data_deps += [ "//clank:telemetry_clank_test" ] - } - if (public_android_sdk) { + if (is_android) { data_deps += [ - "//android_webview:system_webview_apk", - "//android_webview/tools/system_webview_shell:system_webview_shell_apk", - "//chrome/android:monochrome_public_apk", - "//chrome/android:monochrome_public_bundle", + ":telemetry_weblayer_apks", + "//android_webview/test:webview_instrumentation_apk", + "//chrome/android:chrome_public_apk", + "//chrome/android/webapk/shell_apk:maps_go_webapk", ] + + if (enable_chrome_android_internal) { + data_deps += [ "//clank:telemetry_clank_test" ] + } + if (public_android_sdk) { + data_deps += [ + "//android_webview:system_webview_apk", + "//android_webview/tools/system_webview_shell:system_webview_shell_apk", + "//chrome/android:monochrome_public_apk", + "//chrome/android:monochrome_public_bundle", + ] + } + } else if (!is_fuchsia) { + data_deps += [ "//chrome" ] } - } else if (!is_fuchsia) { - data_deps += [ "//chrome" ] - } - if (is_win) { - data_deps += [ "//chrome:reorder_imports" ] - } + if (is_win) { + data_deps += [ "//chrome:reorder_imports" ] + } - if (is_linux) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + if (is_linux) { + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - # CrOS currently has issues with the locally compiled version of - # crashpad_database_util, so only include it on traditional Linux - # platforms. - if (is_desktop_linux) { - data_deps += - [ "//third_party/crashpad/crashpad/tools:crashpad_database_util" ] + # CrOS currently has issues with the locally compiled version of + # crashpad_database_util, so only include it on traditional Linux + # platforms. + if (is_desktop_linux) { + data_deps += + [ "//third_party/crashpad/crashpad/tools:crashpad_database_util" ] + } } - } - if (is_mac) { - data_deps += [ - "//chrome:chrome_framework", - "//chrome:chrome_helper_app_default", - "//third_party/breakpad:dump_syms", - "//third_party/crashpad/crashpad/tools:crashpad_database_util", - ] - } + if (is_mac) { + data_deps += [ + "//chrome:chrome_framework", + "//chrome:chrome_helper_app_default", + "//third_party/breakpad:dump_syms", + "//third_party/crashpad/crashpad/tools:crashpad_database_util", + ] + } - if (is_chromeos && cros_board != "") { - data_deps += [ - "//chromeos:cros_chrome_deploy", - "//chromeos:cros_test_wrapper", - ] - } + if (is_chromeos && cros_board != "") { + data_deps += [ + "//chromeos:cros_chrome_deploy", + "//chromeos:cros_test_wrapper", + ] + } - if (is_win && (symbol_level == 1 || symbol_level == 2)) { - data_deps += [ - "//build/win:copy_cdb_to_output", - "//third_party/crashpad/crashpad/tools:crashpad_database_util", - ] + if (is_win && (symbol_level == 1 || symbol_level == 2)) { + data_deps += [ + "//build/win:copy_cdb_to_output", + "//third_party/crashpad/crashpad/tools:crashpad_database_util", + ] + } } -} -group("telemetry_weblayer_apks") { - testonly = true + group("telemetry_weblayer_apks") { + testonly = true - data_deps = [] - if (is_android) { - data_deps += [ - "//weblayer/shell/android:weblayer_shell_system_webview_apk", + data_deps = [] + if (is_android) { + data_deps += [ + "//weblayer/shell/android:weblayer_shell_system_webview_apk", - # TODO(crbug.com/1022823): Remove the following two deps once our tooling - # is configured to use weblayer_shell_system_webview_apk. - "//weblayer/shell/android:weblayer_shell_apk", - "//weblayer/shell/android:weblayer_support_apk", - ] + # TODO(crbug.com/1022823): Remove the following two deps once our tooling + # is configured to use weblayer_shell_system_webview_apk. + "//weblayer/shell/android:weblayer_shell_apk", + "//weblayer/shell/android:weblayer_support_apk", + ] + } } } -} -group("telemetry_chrome_test_without_chrome") { - testonly = true - - data = [ - "//components/crash/content/tools/generate_breakpad_symbols.py", - "//testing/scripts/common.py", - "//testing/xvfb.py", - "//tools/perf/chrome_telemetry_build/", - "//tools/perf/core/", # chrome_telemetry_build/ depends on core/ - ] - data_deps = [ - "//third_party/catapult:telemetry_chrome_test_support", - "//tools/metrics:metrics_python_tests", - ] - - # Cr-Fuchsia doesn't support breakpad. - if (!is_win && !is_fuchsia) { - data_deps += [ - # This is defined for Windows, but is unused by Telemetry on - # Windows, and including it can have issues when cross-compiling - # for Arm-based Windows. - "//third_party/breakpad:dump_syms", - - # These explicitly not defined for Windows builds in Breakpad. - "//third_party/breakpad:minidump_dump", - "//third_party/breakpad:minidump_stackwalk", +if (!is_tizen) { + group("telemetry_chrome_test_without_chrome") { + testonly = true + + data = [ + "//components/crash/content/tools/generate_breakpad_symbols.py", + "//testing/scripts/common.py", + "//testing/xvfb.py", + "//tools/perf/chrome_telemetry_build/", + "//tools/perf/core/", # chrome_telemetry_build/ depends on core/ + ] + data_deps = [ + "//third_party/catapult:telemetry_chrome_test_support", + "//tools/metrics:metrics_python_tests", ] - } + # Cr-Fuchsia doesn't support breakpad. + if (!is_win && !is_fuchsia) { + data_deps += [ + # This is defined for Windows, but is unused by Telemetry on + # Windows, and including it can have issues when cross-compiling + # for Arm-based Windows. + "//third_party/breakpad:dump_syms", + + # These explicitly not defined for Windows builds in Breakpad. + "//third_party/breakpad:minidump_dump", + "//third_party/breakpad:minidump_stackwalk", + ] + } + } if (is_android) { data += [ # TODO(httpss://crbug.com/833808): Remove this once bots always set diff --git a/v8/BUILD.gn b/v8/BUILD.gn index 840ccd8..d7e7fad 100644 --- a/v8/BUILD.gn +++ b/v8/BUILD.gn @@ -334,7 +334,7 @@ v8_toolset_for_shell = "host" # config("internal_config_base") { - visibility = [ ":*" ] # Only targets in this file can depend on this. + visibility = [ "./*" ] # Only targets in this file can depend on this. configs = [ ":v8_tracing_config" ] @@ -347,7 +347,7 @@ config("internal_config_base") { config("internal_config") { defines = [] - visibility = [ ":*" ] # Only targets in this file can depend on this. + visibility = [ "./*" ] # Only targets in this file can depend on this. configs = [ "//build/config/compiler:wexit_time_destructors", @@ -464,7 +464,7 @@ config("v8_header_features") { # Put defines here that are only used in our internal files and NEVER in # external headers that embedders (such as chromium and node) might include. config("features") { - visibility = [ ":*" ] # Only targets in this file can depend on this. + visibility = [ "./*" ] # Only targets in this file can depend on this. defines = [] @@ -597,7 +597,7 @@ config("features") { } config("toolchain") { - visibility = [ ":*" ] # Only targets in this file can depend on this. + visibility = [ "./*" ] # Only targets in this file can depend on this. defines = [] cflags = [] diff --git a/v8/third_party/inspector_protocol/BUILD.gn b/v8/third_party/inspector_protocol/BUILD.gn index 33ef78c..411d8c6 100644 --- a/v8/third_party/inspector_protocol/BUILD.gn +++ b/v8/third_party/inspector_protocol/BUILD.gn @@ -5,7 +5,10 @@ import("../../gni/v8.gni") config("crdtp_config") { - visibility = [ "../../src/inspector:*" ] + visibility = [ + "../../src/inspector:*", + "./*", + ] configs = [ "../../:internal_config" ] include_dirs = [ "../../include" ] }