diff options
| -rw-r--r-- | libc/Android.bp | 4 | ||||
| -rw-r--r-- | libdl/Android.bp | 2 | ||||
| -rw-r--r-- | libm/Android.bp | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 89657d70f..f0efca35c 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1773,6 +1773,7 @@ cc_library { arm: { //TODO: This is to work around b/24465209. Remove after root cause is fixed ldflags: ["-Wl,--hash-style=both"], + use_clang_lld: false, // Don't re-export new/delete and friends, even if the compiler really wants to. version_script: "libc.arm.map", @@ -1806,6 +1807,7 @@ cc_library { x86: { //TODO: This is to work around b/24465209. Remove after root cause is fixed ldflags: ["-Wl,--hash-style=both"], + use_clang_lld: false, // Don't re-export new/delete and friends, even if the compiler really wants to. version_script: "libc.x86.map", @@ -1837,6 +1839,7 @@ cc_library { arch: { arm: { ldflags: ["-Wl,--hash-style=both"], + use_clang_lld: false, version_script: "libstdc++.arm.map", }, arm64: { @@ -1850,6 +1853,7 @@ cc_library { }, x86: { ldflags: ["-Wl,--hash-style=both"], + use_clang_lld: false, version_script: "libstdc++.x86.map", }, x86_64: { diff --git a/libdl/Android.bp b/libdl/Android.bp index 97f103846..9d979577b 100644 --- a/libdl/Android.bp +++ b/libdl/Android.bp @@ -50,6 +50,7 @@ cc_library { arm: { version_script: "libdl.arm.map", ldflags: ["-Wl,--hash-style=both"], + use_clang_lld: false, }, arm64: { version_script: "libdl.arm64.map", @@ -65,6 +66,7 @@ cc_library { "-Wl,--exclude-libs=libgcc_eh.a", "-Wl,--hash-style=both", ], + use_clang_lld: false, version_script: "libdl.x86.map", }, x86_64: { diff --git a/libm/Android.bp b/libm/Android.bp index c67e358d4..76bbca3cd 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -294,6 +294,7 @@ cc_library { }, instruction_set: "arm", ldflags: ["-Wl,--hash-style=both"], + use_clang_lld: false, version_script: "libm.arm.map", }, @@ -421,6 +422,7 @@ cc_library { }, local_include_dirs: ["i387"], ldflags: ["-Wl,--hash-style=both"], + use_clang_lld: false, version_script: "libm.x86.map", }, |