From 6ac7c8f25170c85265fca69fd1fe5d31baf3344f Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Tue, 15 Oct 2024 16:10:08 +0000 Subject: [PATCH] Revert "Do not enable libyuv_use_sme for is_android" This reverts commit 51e2e12b9b59452b1ad16c33a88bbcdd085b5450. Reason for revert: The llvm bug fix https://github.com/llvm/llvm-project/pull/102979 has been rolled into Chrome in https://chromium-review.googlesource.com/5921462. Original change's description: > Do not enable libyuv_use_sme for is_android > > Revert the changes to libyuv.gni in commit dfa279f. > > The linker error "undefined symbol: __getauxval" referenced by > sme-abi-init.c:26 on Android, previously reported in > https://libyuv.g-issues.chromium.org/issues/359006069#comment2, has not > been fixed yet. See > https://chromium-review.googlesource.com/c/chromium/src/+/5918245?tab=checks. > > Change-Id: I94bd243e2863b9c316909f63f757fd95ec55dc18 > Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5917455 > Reviewed-by: Frank Barchard Bug: 359006069 Change-Id: Ic801c1bcb65894fdfe718ba6454669c8623a2e15 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/5935026 Reviewed-by: Frank Barchard Bot-Commit: Rubber Stamper Reviewed-by: George Steed --- libyuv.gni | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libyuv.gni b/libyuv.gni index 07182d14b..3334df70b 100644 --- a/libyuv.gni +++ b/libyuv.gni @@ -20,11 +20,11 @@ declare_args() { (current_cpu == "arm" && (arm_use_neon || arm_optionally_use_neon)) libyuv_use_sve = current_cpu == "arm64" - # Restrict to is_linux to work around undefined symbol linker errors on - # Android, Fuchsia, macOS, and compilation errors on Windows. - # TODO: bug 359006069 - Remove the is_linux restriction after the linker and + # Restrict to (is_linux || is_android) to work around undefined symbol linker + # errors on Fuchsia, macOS, and compilation errors on Windows. + # TODO: bug 359006069 - Remove the restriction after the linker and # compilation errors are fixed. - libyuv_use_sme = current_cpu == "arm64" && is_linux + libyuv_use_sme = current_cpu == "arm64" && (is_linux || is_android) libyuv_use_msa = (current_cpu == "mips64el" || current_cpu == "mipsel") && mips_use_msa libyuv_use_mmi =