Fixing libyuv gn check.
Starting from [1], GN is able to ensure that the inclusion or headers
with relative paths is matched by a GN dependency.
This CL fixes the libyuv build graph according to GN.
[1] - https://chromium-review.googlesource.com/c/chromium/src/+/827014
Bug: webrtc:8850
Change-Id: I7e0f9a8bd1ae2d205213dc75bf322be587efd1f5
Reviewed-on: https://chromium-review.googlesource.com/903843
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 10b5b81..03ce499 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -48,6 +48,7 @@
group("libyuv") {
all_dependent_configs = [ ":libyuv_config" ]
+ deps = []
if (is_win && target_cpu == "x64") {
# Compile with clang in order to get inline assembly
@@ -60,13 +61,19 @@
]
}
+ if (libyuv_use_neon) {
+ deps += [ ":libyuv_neon" ]
+ }
+
+ if (libyuv_use_msa) {
+ deps += [ ":libyuv_msa" ]
+ }
+
if (!is_ios) {
# Make sure that clients of libyuv link with libjpeg. This can't go in
# libyuv_internal because in Windows x64 builds that will generate a clang
# build of libjpeg, and we don't want two copies.
- deps = [
- "//third_party:jpeg",
- ]
+ deps += [ "//third_party:jpeg" ]
}
}
@@ -147,14 +154,6 @@
deps += [ "//third_party:jpeg_includes" ]
}
- if (libyuv_use_neon) {
- deps += [ ":libyuv_neon" ]
- }
-
- if (libyuv_use_msa) {
- deps += [ ":libyuv_msa" ]
- }
-
# Always enable optimization for Release and NaCl builds (to workaround
# crbug.com/538243).
if (!is_debug || is_nacl) {
@@ -174,6 +173,7 @@
]
}
}
+
if (libyuv_use_neon) {
static_library("libyuv_neon") {
sources = [
@@ -188,6 +188,10 @@
"source/scale_neon64.cc",
]
+ deps = [
+ ":libyuv_internal",
+ ]
+
public_configs = [ ":libyuv_config" ]
# Always enable optimization for Release and NaCl builds (to workaround
@@ -217,6 +221,10 @@
"source/scale_msa.cc",
]
+ deps = [
+ ":libyuv_internal",
+ ]
+
public_configs = [ ":libyuv_config" ]
}
}
