From bc9a7806a5a9a046a58821dab0f65245766f2b07 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 13 Nov 2018 10:00:25 -0800 Subject: [PATCH] chore: remove add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch (#15692) --- patches/common/chromium/.patches | 1 - ...dependencies_even_for_sysroot_builds.patch | 19 ------------------- 2 files changed, 20 deletions(-) delete mode 100644 patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index cef44f416af6..69a8b3b65020 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -27,7 +27,6 @@ webview_cross_drag.patch worker_context_will_destroy.patch browser_plugin_guest.patch disable_user_gesture_requirement_for_beforeunload_dialogs.patch -add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch gin_enable_disable_v8_platform.patch blink-worker-enable-csp-in-file-scheme.patch disable-redraw-lock.patch diff --git a/patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch b/patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch deleted file mode 100644 index 82fa2ccb0771..000000000000 --- a/patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aleksei Kuzmin -Date: Thu, 20 Sep 2018 17:47:36 -0700 -Subject: add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch - - -diff --git a/base/BUILD.gn b/base/BUILD.gn -index 7fb93868d6e009323eceb2ba0f1ff9c506dc5f3b..53c5744953da460c02b43de1bfd184cd92489167 100644 ---- a/base/BUILD.gn -+++ b/base/BUILD.gn -@@ -1248,7 +1248,7 @@ jumbo_component("base") { - # Needed for if using newer C++ library than sysroot, except if - # building inside the cros_sdk environment - use host_toolchain as a - # more robust check for this. -- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && -+ if ((is_android || (is_linux && !is_chromecast)) && - host_toolchain != "//build/toolchain/cros:host") { - libs += [ "atomic" ] - }