Fix libc++ dependency for linux installer

chrome/installer/linux/BUILD.gn

 # Copyright 2015 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/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/util/process_version.gni")
 import("//build/util/version.gni")
 import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
@@ skipping 182 matching lines @@
   }
   if (current_cpu == "x86" || current_cpu == "x64") {
     public_deps += [
       "//third_party/widevine/cdm:widevinecdm",
       "//third_party/widevine/cdm:widevinecdmadapter",
     ]
   }
   if (!is_chromeos) {
     public_deps += [ ":rpm_packaging_files" ]
   }
+  if (use_custom_libcxx) {
+    public_deps += [ "//buildtools/third_party/libc++" ]
+  }
 }
 
 # Creates .deb and .rpm (RPM for non-ChromeOS only) installer packages.
 #
 # channel:
 #   Name of the channel.
 template("linux_package") {
   assert(defined(invoker.channel))
   channel = invoker.channel
 
@@ skipping 26 matching lines @@
   }
 
   # The widevine BUILD.gn only produces shared libraries for x86 and x64
   if (is_chrome_branded && (current_cpu == "x86" || current_cpu == "x64")) {
     packaging_files_binaries += [
       "$root_out_dir/$widevine_cdm_path/libwidevinecdmadapter.so",
       "$root_out_dir/$widevine_cdm_path/libwidevinecdm.so",
     ]
   }
 
-  if (is_asan) {
-    packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ]
+  if (use_custom_libcxx) {
+    packaging_files_binaries += [ "$root_out_dir/libc++.so" ]
   }
 
   deb_target_name = "${target_name}_deb"
   action(deb_target_name) {
     visibility = [ ":*" ]
     script = "flock_make_package.py"
 
     if (current_cpu == "x86") {
       deb_arch = "i386"
     } else if (current_cpu == "x64") {
@@ skipping 93 matching lines @@
 # Other packages that we support that aren't included in the default "linux"
 # target.
 linux_package("trunk") {
   channel = "trunk"
 }
 if (is_asan) {
   linux_package("asan") {
     channel = "asan"
   }
 }