From de63bd90f4396313f864ad58b65279e7894451a9 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Tue, 26 May 2026 11:58:12 -0400 Subject: [PATCH] Stop setting --dynamic-linker for target_os="android" lld ignores it for shared libraries, but wild linker adds an .interp section because of it. Regardless, llvm has long known to set the correct linker flag when building for android. Bug: 40208899 Change-Id: I50dc015946382f9e99289333e7d8b870409ed8d6 Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/7874019 Reviewed-by: Frank Barchard Commit-Queue: Andrew Grieve Reviewed-by: Mirko Bonadei --- BUILD.gn | 7 ------- libyuv.gyp | 12 ------------ 2 files changed, 19 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 0c0749998..2288e24a5 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -22,13 +22,6 @@ declare_args() { config("libyuv_config") { include_dirs = [ "include" ] - if (is_android) { - if (target_cpu == "arm" || target_cpu == "x86") { - ldflags = [ "-Wl,--dynamic-linker,/system/bin/linker" ] - } else { - ldflags = [ "-Wl,--dynamic-linker,/system/bin/linker64" ] - } - } # Define CHROMIUM to tell cpu_id to avoid sandbox unsafe system calls. defines = [ "CHROMIUM" ] diff --git a/libyuv.gyp b/libyuv.gyp index 394840216..fa4b146a4 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -122,18 +122,6 @@ 'include', '.', ], - 'conditions': [ - ['OS == "android" and target_arch == "arm64"', { - 'ldflags': [ - '-Wl,--dynamic-linker,/system/bin/linker64', - ], - }], - ['OS == "android" and target_arch != "arm64"', { - 'ldflags': [ - '-Wl,--dynamic-linker,/system/bin/linker', - ], - }], - ], #conditions }, 'sources': [ '<@(libyuv_sources)',