Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: extensions/shell/installer/linux/BUILD.gn

Issue 2931983003: Move libc++ configs and flags out of //build/config/sanitizers (Closed)
Patch Set: Update installer files Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/linux/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/installer/linux/BUILD.gn
diff --git a/extensions/shell/installer/linux/BUILD.gn b/extensions/shell/installer/linux/BUILD.gn
index 87d9c9081b6746c22a6dcce6ef6f918438f6b5b7..d537e7130ecac8126252abafe38ff615000dc3c3 100644
--- a/extensions/shell/installer/linux/BUILD.gn
+++ b/extensions/shell/installer/linux/BUILD.gn
@@ -4,6 +4,7 @@
# TODO(michaelpg): Dedupe with Chrome installer.
+import("//build/config/c++/c++.gni")
import("//build/config/chrome_build.gni")
import("//build/config/features.gni")
import("//build/config/sanitizers/sanitizers.gni")
@@ -127,9 +128,6 @@ group("installer_deps") {
"//ppapi/native_client:irt",
]
}
- if (use_custom_libcxx) {
- public_deps += [ "//buildtools/third_party/libc++" ]
- }
}
# Creates .deb installer package.
@@ -156,7 +154,11 @@ template("linux_package") {
]
}
- if (use_custom_libcxx) {
+ # TODO(thomasanderson): Move this variable into a .gni file
+ # somewhere. It is currently copied from
+ # buildtools/third_party/libc++/BUILD.gn.
+ libcpp_is_static = !is_component_build && !using_sanitizer
+ if (!libcpp_is_static && use_custom_libcxx) {
packaging_files_binaries += [ "$root_out_dir/libc++.so" ]
}
« no previous file with comments | « chrome/installer/linux/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698