Remove libcpp_is_static

This change makes libc++ a shared_library iff is_component_build=true, just like
all other components.  This has the advantage that the RPATH doesn't need to be
set in sanitizer (non-component) builds just so binaries can find libc++.so.
This CL also changes RPATH to be set iff is_component_build=true.

Needs buildtools CL:
https://chromium-review.googlesource.com/c/chromium/buildtools/+/1142370

TBR=dpranke,jochen
R=thakis
BUG=850682
CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux_chromium_msan_rel_ng;master.tryserver.chromium.linux:linux_chromium_ubsan_rel_ng;luci.chromium.try:linux_chromium_asan_rel_ng;luci.chromium.try:linux_chromium_tsan_rel_ng

Change-Id: I96e74da6d907659b939a0f229693bbd2a6d9140a
Reviewed-on: https://chromium-review.googlesource.com/1119098
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Peter Collingbourne <pcc@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578085}

DEPS

@@ -121,7 +121,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling build tools
   # and whatever else without interference from each other.
-  'buildtools_revision': '0dd5c6f980d22be96b728155249df2da355989d9',
+  'buildtools_revision': '691bfec9d73bfefae30bad32e7a6496f2beceb9c',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.

build/config/BUILD.gn

@@ -277,7 +277,7 @@ config("default_libs") {
 }
 
 # Only //build/config/BUILDCONFIG.gn should reference this.
-group("executable_and_loadable_module_and_shared_library_deps") {
+group("common_deps") {
   public_deps = []
 
   if (using_sanitizer) {
@@ -301,6 +301,33 @@ group("executable_and_loadable_module_and_shared_library_deps") {
   }
 }
 
+group("executable_deps") {
+  public_deps = [
+    ":common_deps",
+  ]
+  if (use_custom_libcxx && !is_component_build) {
+    public_deps += [ "//buildtools/third_party/libc++abi" ]
+  }
+}
+
+group("loadable_module_deps") {
+  public_deps = [
+    ":common_deps",
+  ]
+  if (use_custom_libcxx && !is_component_build && !(is_asan || is_ubsan_vptr)) {
+    public_deps += [ "//buildtools/third_party/libc++abi" ]
+  }
+}
+
+group("shared_library_deps") {
+  public_deps = [
+    ":common_deps",
+  ]
+  if (use_custom_libcxx && !is_component_build && !(is_asan || is_ubsan_vptr)) {
+    public_deps += [ "//buildtools/third_party/libc++abi" ]
+  }
+}
+
 # Executable configs -----------------------------------------------------------
 
 # Windows linker setup for EXEs and DLLs.

build/config/BUILDCONFIG.gn

@@ -650,20 +650,20 @@ set_defaults("loadable_module") {
 #
 # Variables
 #   no_default_deps: If true, no standard dependencies will be added.
-foreach(target_type,
+foreach(_target_type,
         [
           "executable",
           "loadable_module",
           "shared_library",
         ]) {
-  template(target_type) {
-    target(target_type, target_name) {
+  template(_target_type) {
+    target(_target_type, target_name) {
       forward_variables_from(invoker, "*", [ "no_default_deps" ])
       if (!defined(deps)) {
         deps = []
       }
       if (!defined(invoker.no_default_deps) || !invoker.no_default_deps) {
-        deps += [ "//build/config:executable_and_loadable_module_and_shared_library_deps" ]
+        deps += [ "//build/config:${_target_type}_deps" ]
       }
     }
   }

build/config/c++/c++.gni

@@ -22,16 +22,6 @@ declare_args() {
   # expected usage is to set use_custom_libcxx=false and
   # use_custom_libcxx_for_host=true in the passed in buildargs.
   use_custom_libcxx_for_host = false
-
-  # ASan, MSan and TSan builds need to override operator new, operator delete,
-  # and some exception handling symbols, so libc++ must be a shared library to
-  # prevent duplicate symbol errors when linking.
-  # Additionally, -fsanitize=vptr requires libc++ to be a shared library
-  # because the ubsan runtime library that implements -fsanitize=vptr calls
-  # dynamic_cast with the ABI type info classes, which won't return the right
-  # answer if each DSO has its own copy of the ABI classes.
-  libcpp_is_static = !is_component_build && !is_asan && !is_msan && !is_tsan &&
-                     !is_ubsan && !is_ubsan_security && !is_ubsan_vptr
 }
 
 use_custom_libcxx =

build/config/gcc/BUILD.gn

@@ -110,8 +110,8 @@ config("executable_ldconfig") {
     ]
   } else {
     # See the rpath_for... config above for why this is necessary for component
-    # builds. Sanitizers use a custom libc++ where this is also necessary.
-    if (is_component_build || using_sanitizer || !libcpp_is_static) {
+    # builds.
+    if (is_component_build) {
       configs = [ ":rpath_for_built_shared_libraries" ]
     }
     if (current_cpu == "mipsel" || current_cpu == "mips64el") {

build/config/posix/BUILD.gn

@@ -35,12 +35,12 @@ config("runtime_library") {
   libs = []
 
   if (use_custom_libcxx) {
-    if (libcpp_is_static) {
+    if (!is_component_build) {
       # Don't leak any symbols on a static build.
-      defines += [
-        "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-        "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
-      ]
+      defines += [ "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS" ]
+      if (!is_asan && !is_ubsan_vptr) {
+        defines += [ "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" ]
+      }
     }
     if (!is_clang) {
       # Gcc has a built-in abs() definition with default visibility.

build/config/win/BUILD.gn

@@ -222,7 +222,7 @@ config("runtime_library") {
   if (use_custom_libcxx) {
     cflags_cc +=
         [ "-I" + rebase_path("$libcxx_prefix/include", root_build_dir) ]
-    if (libcpp_is_static) {
+    if (!is_component_build) {
       defines += [ "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS" ]
     }
 

chrome/installer/linux/BUILD.gn

@@ -53,10 +53,6 @@ if (is_chrome_branded && (current_cpu == "x86" || current_cpu == "x64")) {
       [ "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so" ]
 }
 
-if (!libcpp_is_static && use_custom_libcxx) {
-  packaging_files_shlibs += [ "$root_out_dir/libc++.so" ]
-}
-
 packaging_files_binaries = packaging_files_executables + packaging_files_shlibs
 
 # TODO(mmoss) Any convenient way to get all the relevant build files?
@@ -373,10 +369,6 @@ group("installer_deps") {
   if (!is_chromeos) {
     public_deps += [ ":rpm_packaging_files" ]
   }
-
-  if (!libcpp_is_static && use_custom_libcxx) {
-    public_deps += [ "//buildtools/third_party/libc++:libc++" ]
-  }
 }
 
 # Creates .deb and .rpm (RPM for non-ChromeOS only) installer packages.

extensions/shell/installer/linux/BUILD.gn

@@ -136,10 +136,6 @@ group("installer_deps") {
       "//ppapi/native_client:irt",
     ]
   }
-
-  if (!libcpp_is_static && use_custom_libcxx) {
-    public_deps += [ "//buildtools/third_party/libc++:libc++" ]
-  }
 }
 
 # Creates .deb installer package.
@@ -166,10 +162,6 @@ template("linux_package") {
     ]
   }
 
-  if (!libcpp_is_static && use_custom_libcxx) {
-    packaging_files_binaries += [ "$root_out_dir/libc++.so" ]
-  }
-
   deb_target_name = "${target_name}_deb"
   action(deb_target_name) {
     visibility = [ ":*" ]

remoting/host/linux/BUILD.gn

@@ -62,10 +62,10 @@ if (enable_me2me_host) {
     if (is_component_build) {
       sources += [ "$root_build_dir/libbase.so" ]
       deps += [ "//base:base" ]
-    }
-    if (!libcpp_is_static && use_custom_libcxx) {
-      sources += [ "$root_build_dir/libc++.so" ]
-      deps += [ "//buildtools/third_party/libc++" ]
+      if (use_custom_libcxx) {
+        sources += [ "$root_build_dir/libc++.so" ]
+        deps += [ "//buildtools/third_party/libc++" ]
+      }
     }
   }