diff options
author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2023-06-12 21:28:09 +0000 |
---|---|---|
committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-06-12 21:28:09 +0000 |
commit | 01fadae8618ea360608cc52c823a022c48f855b5 (patch) | |
tree | 303e8eabb435a80ebec36a19c23ca85744d58fb5 /files/BUILD.gn | |
parent | 435db9f11b09187e0d60683813a28d07cc13166b (diff) | |
download | libyuv-01fadae8618ea360608cc52c823a022c48f855b5.tar.gz |
libyuv: Update to r1871 (2a6cb743)
Changes from upstream:
https://chromium.googlesource.com/libyuv/libyuv/+log/d53f1bee..2a6cb743
The intention of the CL is to import the functions necessary to
enable AV1 (and AVIF) 12-bit color conversion.
Bug: 268505204
Test: Builds. Media and Camera CTS tests pass.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:27750a13c6eaacb9f716da3fe1734a8d106d7ff4)
Merged-In: I756d3bd5047d4719659f9e1a449217b1940e51a4
Change-Id: I756d3bd5047d4719659f9e1a449217b1940e51a4
Diffstat (limited to 'files/BUILD.gn')
-rw-r--r-- | files/BUILD.gn | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/files/BUILD.gn b/files/BUILD.gn index a72ff065..adaae9d8 100644 --- a/files/BUILD.gn +++ b/files/BUILD.gn @@ -6,6 +6,7 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. +import("//build/config/features.gni") import("//testing/test.gni") import("libyuv.gni") @@ -21,15 +22,19 @@ declare_args() { config("libyuv_config") { include_dirs = [ "include" ] - if (is_android && current_cpu == "arm64") { - ldflags = [ "-Wl,--dynamic-linker,/system/bin/linker64" ] - } - if (is_android && current_cpu != "arm64") { - ldflags = [ "-Wl,--dynamic-linker,/system/bin/linker" ] + if (is_android) { + if (target_cpu == "arm" || target_cpu == "x86" || target_cpu == "mipsel") { + ldflags = [ "-Wl,--dynamic-linker,/system/bin/linker" ] + } else { + ldflags = [ "-Wl,--dynamic-linker,/system/bin/linker64" ] + } } - + defines = [] if (!libyuv_use_neon) { - defines = [ "LIBYUV_DISABLE_NEON" ] + defines += [ "LIBYUV_DISABLE_NEON" ] + } + if (libyuv_disable_rvv) { + defines += [ "LIBYUV_DISABLE_RVV" ] } } @@ -129,6 +134,7 @@ static_library("libyuv_internal") { "source/row_any.cc", "source/row_common.cc", "source/row_gcc.cc", + "source/row_rvv.cc", "source/row_win.cc", "source/scale.cc", "source/scale_any.cc", @@ -150,7 +156,7 @@ static_library("libyuv_internal") { configs += [ "//build/config/gcc:symbol_visibility_default" ] } - if (!is_ios && !libyuv_disable_jpeg) { + if ((!is_ios || use_blink) && !libyuv_disable_jpeg) { defines += [ "HAVE_JPEG" ] # Needed to pull in libjpeg headers. Can't add //third_party:jpeg to deps |