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

Unified Diff: third_party/libvpx/BUILD.gn

Issue 2273583002: libvpx: Prevent unintended targets to be built with msan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libvpx/BUILD.gn
diff --git a/third_party/libvpx/BUILD.gn b/third_party/libvpx/BUILD.gn
index ea4323b2d650fab5e7494a9c6f003f5057b058b3..8c1a58be2ce40bbbc89064c3a89ed352b5284870 100644
--- a/third_party/libvpx/BUILD.gn
+++ b/third_party/libvpx/BUILD.gn
@@ -90,7 +90,7 @@ config("libvpx_external_config") {
include_dirs = [ "//third_party/libvpx/source/libvpx" ]
}
-if (current_cpu == "x86" || current_cpu == "x64") {
+if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) {
yasm_assemble("libvpx_yasm") {
if (current_cpu == "x86") {
sources = libvpx_srcs_x86_assembly
@@ -113,7 +113,7 @@ if (current_cpu == "x86" || current_cpu == "x64") {
}
}
-if (current_cpu == "x86" || current_cpu == "x64") {
+if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) {
# The following targets are deliberately source_set rather than
# static_library. The :libvpx target exposes these intrinsic implementations
# via global function pointer symbols, which hides the object dependency at
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698