From 5205154107706d031d49ec8c638e4abcb0906ebf Mon Sep 17 00:00:00 2001 From: Chandan Padhi Date: Wed, 9 Sep 2020 18:58:14 +0530 Subject: [PATCH] fixup! Upload upstream chromium 85.0.4183.93 Few files were not updated with latest code due to conflicts during cherry-pick of delta patch from tizen.upstream branch. This commit updates these files as required. Change-Id: I82283d1f898d0abee0e45e0a1809f8c32263eec6 Signed-off-by: Chandan Padhi --- base/third_party/libevent/BUILD.gn | 15 +++++ build/config/linux/BUILD.gn | 39 ----------- build/linux/unbundle/zlib.gn | 51 --------------- tools/perf/BUILD.gn | 129 ++++++++++++++++++------------------- 4 files changed, 79 insertions(+), 155 deletions(-) create mode 100644 base/third_party/libevent/BUILD.gn diff --git a/base/third_party/libevent/BUILD.gn b/base/third_party/libevent/BUILD.gn new file mode 100644 index 0000000..7e1c34d --- /dev/null +++ b/base/third_party/libevent/BUILD.gn @@ -0,0 +1,15 @@ +# 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. + +import("//build/shim_headers.gni") + +shim_headers("libevent_shim") { + root_path = "." + headers = [ "event.h" ] +} + +source_set("libevent") { + deps = [ ":libevent_shim" ] + libs = [ "event" ] +} diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn index 13ba8fc..fda1419 100644 --- a/build/config/linux/BUILD.gn +++ b/build/config/linux/BUILD.gn @@ -35,45 +35,6 @@ config("runtime_library") { } } -pkg_config("freetype2") { - visibility = [ "//build/linux:freetype2" ] - - packages = [ "freetype2" ] -} - -pkg_config("glib") { - packages = [ - "glib-2.0", - "gmodule-2.0", - "gobject-2.0", - "gthread-2.0", - ] -} - -#if (use_pango || use_cairo) { -# pkg_config("pangocairo") { -# packages = [ "pangocairo" ] -# } -#} - -#if (use_pango) { -# pkg_config("pangoft2") { -# packages = [ "pangoft2" ] -# } -#} - -# Note: if your target also depends on //dbus, you don't need to add this -# config (it will get added automatically if you depend on //dbus). -pkg_config("dbus") { - packages = [ "dbus-1" ] -} - -if (!is_tizen) { - pkg_config("libffi") { - packages = [ "libffi" ] - } -} - config("x11") { libs = [ "X11", diff --git a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn index f42eca4..97d6aeb 100644 --- a/build/linux/unbundle/zlib.gn +++ b/build/linux/unbundle/zlib.gn @@ -62,54 +62,3 @@ static_library("compression_utils") { ] deps = [ ":zlib" ] } - -config("minizip_warnings") { - visibility = [ ":*" ] - if (is_clang) { - # zlib uses `if ((a == b))` for some reason. - cflags = [ "-Wno-parentheses-equality" ] - } -} - -config("zlib_config") { - include_dirs = [ "." ] -} - -static_library("minizip") { - sources = [ - "contrib/minizip/ioapi.c", - "contrib/minizip/ioapi.h", - "contrib/minizip/iowin32.c", - "contrib/minizip/iowin32.h", - "contrib/minizip/unzip.c", - "contrib/minizip/unzip.h", - "contrib/minizip/zip.c", - "contrib/minizip/zip.h", - ] - - if (!is_win) { - sources -= [ - "contrib/minizip/iowin32.c", - "contrib/minizip/iowin32.h", - ] - } - if (is_mac || is_ios || is_android || is_nacl) { - # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We - # use fopen, ftell, and fseek instead on these systems. - defines = [ "USE_FILE32API" ] - } - - deps = [ - ":zlib", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ - "//build/config/compiler:no_chromium_code", - - # Must be after no_chromium_code for warning flags to be ordered correctly. - ":minizip_warnings", - ] - - public_configs = [ ":zlib_config" ] -} diff --git a/tools/perf/BUILD.gn b/tools/perf/BUILD.gn index 71503ad..37af4bb 100644 --- a/tools/perf/BUILD.gn +++ b/tools/perf/BUILD.gn @@ -4,20 +4,20 @@ # Keep in sync with group("perf_without_chrome"). if (!is_tizen) { -group("perf") { - testonly = true - deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ] - data = [ - "//tools/perf/", + group("perf") { + testonly = true + deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ] + data = [ + "//tools/perf/", # Field trial config "//tools/variations/", "//testing/variations/", - # Field trial dependencies - "//tools/json_comment_eater/", - "//tools/json_to_struct/", - "//components/variations/service/generate_ui_string_overrider.py", + # Field trial dependencies + "//tools/json_comment_eater/", + "//tools/json_to_struct/", + "//components/variations/service/generate_ui_string_overrider.py", # For blink_perf benchmarks. "//third_party/blink/perf_tests/", @@ -25,76 +25,75 @@ group("perf") { # For smoothness.tough_canvas_cases "//chrome/test/data/perf/", - # For Pylib used by VR tests - "//build/android/pylib/", - ] + # For Pylib used by VR tests + "//build/android/pylib/", + ] - # Runs a script which generates the ad tagging ruleset. - if (!is_ios) { - data_deps = [ "//components/subresource_filter/tools:index_ruleset" ] + # Runs a script which generates the ad tagging ruleset. + if (!is_ios) { + data_deps = [ "//components/subresource_filter/tools:index_ruleset" ] + } } -} - -if (is_android) { - import("//build/util/generate_wrapper.gni") - generate_wrapper("run_benchmark_wrapper") { - executable = "run_benchmark" - wrapper_script = "$root_build_dir/bin/run_benchmark" - executable_args = [ - "--chromium-output-directory", - "@WrappedPath(.)", - ] + if (is_android) { + import("//build/util/generate_wrapper.gni") + + generate_wrapper("run_benchmark_wrapper") { + executable = "run_benchmark" + wrapper_script = "$root_build_dir/bin/run_benchmark" + executable_args = [ + "--chromium-output-directory", + "@WrappedPath(.)", + ] + } } -} -# Group for running benchmarks without building Chrome. Keep in sync with -# group("perf"). -group("perf_without_chrome") { - testonly = true - deps = [ - "//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome", - ] + # Group for running benchmarks without building Chrome. Keep in sync with + # group("perf"). + group("perf_without_chrome") { + testonly = true + deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome" ] - data = [ - "//tools/perf/", + data = [ + "//tools/perf/", - # Field trial config - "//tools/variations/", - "//testing/variations/", + # Field trial config + "//tools/variations/", + "//testing/variations/", - # Field trial dependencies - "//tools/json_comment_eater/", - "//tools/json_to_struct/", - "//components/variations/service/generate_ui_string_overrider.py", + # Field trial dependencies + "//tools/json_comment_eater/", + "//tools/json_to_struct/", + "//components/variations/service/generate_ui_string_overrider.py", - # For blink_perf benchmarks. - "//third_party/blink/perf_tests/", + # For blink_perf benchmarks. + "//third_party/blink/perf_tests/", - # For smoothness.tough_canvas_cases - "//chrome/test/data/perf/", + # For smoothness.tough_canvas_cases + "//chrome/test/data/perf/", - # For image_decoding.measurement - "//chrome/test/data/image_decoding/", + # For image_decoding.measurement + "//chrome/test/data/image_decoding/", - # For Pylib used by VR tests - "//build/android/pylib/", - ] + # For Pylib used by VR tests + "//build/android/pylib/", + ] - data_deps = [] + data_deps = [] - # Runs a script which generates the ad tagging ruleset. - if (!is_ios) { - data_deps += [ "//components/subresource_filter/tools:index_ruleset" ] + # Runs a script which generates the ad tagging ruleset. + if (!is_ios) { + data_deps += [ "//components/subresource_filter/tools:index_ruleset" ] + } + if (is_android) { + data_deps += [ "//chrome/android/webapk/shell_apk:maps_go_webapk" ] + } } - if (is_android) { - data_deps += [ "//chrome/android/webapk/shell_apk:maps_go_webapk" ] - } -} -# This group makes visible those targets in subdirectories that are not -# explicitly depended on. -group("gn_all") { - testonly = true - deps = [ "//tools/perf/core/perfetto_binary_roller:upload_trace_processor" ] + # This group makes visible those targets in subdirectories that are not + # explicitly depended on. + group("gn_all") { + testonly = true + deps = [ "//tools/perf/core/perfetto_binary_roller:upload_trace_processor" ] + } } -- 2.7.4