aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2019-05-06 20:12:46 -0700
committerYi Kong <yikong@google.com>2019-05-07 04:45:01 +0000
commitbffe6f16a81d35b54a8c746fa5d3f8bec58c6a87 (patch)
tree8682b3ed4c68a5e2d02e68e44b26ebc7db268a9e
parent125d32cb469d8e31f656543c3ad7b82154bc1689 (diff)
downloadandroid_bionic-bffe6f16a81d35b54a8c746fa5d3f8bec58c6a87.tar.gz
android_bionic-bffe6f16a81d35b54a8c746fa5d3f8bec58c6a87.tar.bz2
android_bionic-bffe6f16a81d35b54a8c746fa5d3f8bec58c6a87.zip
Exclude libgcc_stripped wherever libgcc is excluded
Test: manual testing Bug: 130267141 Bug: 29275768 Merged-In: If50420c05d36e6f680a36673e7c26ca7deb93b28 Change-Id: I1e74c7b13ce0e0fa0e9c98cf9139f85e36b0645d (cherry picked from commit 7ac2afbde37258b8fc489f24bd1fcbf2cac18e39)
-rw-r--r--libdl/Android.bp2
-rw-r--r--linker/Android.bp1
2 files changed, 3 insertions, 0 deletions
diff --git a/libdl/Android.bp b/libdl/Android.bp
index b1ee5ab22..fbbe7ba29 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -47,6 +47,7 @@ cc_library {
ldflags: [
"-Wl,--exclude-libs=libgcc.a",
+ "-Wl,--exclude-libs=libgcc_stripped.a",
"-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
"-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
"-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",
@@ -127,6 +128,7 @@ cc_library {
ldflags: [
"-Wl,--exclude-libs=libgcc.a",
+ "-Wl,--exclude-libs=libgcc_stripped.a",
"-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
"-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
"-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",
diff --git a/linker/Android.bp b/linker/Android.bp
index 73328dad2..728dec575 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -319,6 +319,7 @@ cc_library {
ldflags: [
"-Wl,--exclude-libs=libgcc.a",
+ "-Wl,--exclude-libs=libgcc_stripped.a",
"-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a",
"-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a",
"-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a",