From 6b59d4b47e0f7d30401cd45feec36265f7bdacc9 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Tue, 3 May 2022 01:01:06 +0800 Subject: [PATCH] base: Fix Android build adding extra -latomic We don't use use_sysroot=true, but without it -latomic is added to is_android. --- src/base/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/BUILD.gn b/src/base/BUILD.gn index bd0ef42bd6..4dd085c007 100644 --- a/src/base/BUILD.gn +++ b/src/base/BUILD.gn @@ -1103,7 +1103,7 @@ 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_chromeos || (is_linux && !is_castos)) && + if (!use_sysroot && (is_chromeos || (is_linux && !is_castos)) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] }