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

Unified Diff: third_party/libvpx/BUILD.gn

Issue 2113333002: Change the x86{,_64} intrinsic targets in //third_party/libvpx to be source_sets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « 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 5df461638b21b8e10ef4049453ab7f18b23fedae..ea4323b2d650fab5e7494a9c6f003f5057b058b3 100644
--- a/third_party/libvpx/BUILD.gn
+++ b/third_party/libvpx/BUILD.gn
@@ -114,7 +114,13 @@ if (current_cpu == "x86" || current_cpu == "x64") {
}
if (current_cpu == "x86" || current_cpu == "x64") {
- static_library("libvpx_intrinsics_mmx") {
+ # 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
+ # link time. On Mac, this results in undefined references to the intrinsic
+ # symbols.
+
+ source_set("libvpx_intrinsics_mmx") {
configs += [ ":libvpx_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -129,7 +135,7 @@ if (current_cpu == "x86" || current_cpu == "x64") {
}
}
- static_library("libvpx_intrinsics_sse2") {
+ source_set("libvpx_intrinsics_sse2") {
configs += [ ":libvpx_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -144,7 +150,7 @@ if (current_cpu == "x86" || current_cpu == "x64") {
}
}
- static_library("libvpx_intrinsics_ssse3") {
+ source_set("libvpx_intrinsics_ssse3") {
configs += [ ":libvpx_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -159,7 +165,7 @@ if (current_cpu == "x86" || current_cpu == "x64") {
}
}
- static_library("libvpx_intrinsics_sse4_1") {
+ source_set("libvpx_intrinsics_sse4_1") {
configs += [ ":libvpx_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -174,7 +180,7 @@ if (current_cpu == "x86" || current_cpu == "x64") {
}
}
- static_library("libvpx_intrinsics_avx") {
+ source_set("libvpx_intrinsics_avx") {
configs += [ ":libvpx_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
@@ -191,7 +197,7 @@ if (current_cpu == "x86" || current_cpu == "x64") {
}
}
- static_library("libvpx_intrinsics_avx2") {
+ source_set("libvpx_intrinsics_avx2") {
configs += [ ":libvpx_config" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
« 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