aboutsummaryrefslogtreecommitdiff
path: root/BUILD.gn
diff options
context:
space:
mode:
authorFrank Barchard <fbarchard@google.com>2019-11-13 11:42:38 -0800
committerFrank Barchard <fbarchard@chromium.org>2019-11-13 20:02:40 +0000
commitd82f4baf5fcc19f21b5decd7c4af63f120653e0b (patch)
tree2249a6bffda42f34b841abaec31f85be5601d179 /BUILD.gn
parent6afd9becdf58822b1da6770598d8597c583ccfad (diff)
downloadlibyuv-d82f4baf5fcc19f21b5decd7c4af63f120653e0b.tar.gz
Upstream minor changes. Faster tests, Faster YUV Rotate180 and Mirror
Bug: libyuv:840, libyuv:849: b/144318948 Change-Id: I303c02ac2b838a09d3e623df7a69ffc085fe3cd2 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/1914781 Reviewed-by: Miguel Casas <mcasas@chromium.org> Commit-Queue: Frank Barchard <fbarchard@chromium.org>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn4
1 files changed, 2 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 2196be41..8a6f96db 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -73,7 +73,7 @@ group("libyuv") {
deps += [ ":libyuv_mmi" ]
}
- if (!is_ios) {
+ if (!is_ios && !libyuv_disable_jpeg) {
# 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.
@@ -150,7 +150,7 @@ static_library("libyuv_internal") {
configs += [ "//build/config/gcc:symbol_visibility_default" ]
}
- if (!is_ios) {
+ if (!is_ios && !libyuv_disable_jpeg) {
defines += [ "HAVE_JPEG" ]
# Needed to pull in libjpeg headers. Can't add //third_party:jpeg to deps