mirror of
https://chromium.googlesource.com/libyuv/libyuv
synced 2026-06-15 00:16:08 +08:00
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 <fbarchard@google.com> Commit-Queue: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
This commit is contained in:
parent
9d98aaefe7
commit
de63bd90f4
7
BUILD.gn
7
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" ]
|
||||
|
||||
12
libyuv.gyp
12
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)',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user