Remove default libraries
libdl is part of system_shared_libs now. -ldl -lpthread -lm are now defaults
for host_ldlibs on Linux and Darwin. -lrt is a default for host_ldlibs on
Linux.
Test: m host
Test: mmma bionic
Change-Id: I966e2f88c24fba5e412bee6b6382045a2026a8e4
diff --git a/benchmarks/Android.bp b/benchmarks/Android.bp
index e8745a2..00c9560 100644
--- a/benchmarks/Android.bp
+++ b/benchmarks/Android.bp
@@ -73,7 +73,6 @@
cc_benchmark_host {
name: "bionic-benchmarks-glibc",
defaults: ["bionic-benchmarks-defaults"],
- host_ldlibs: ["-lrt"],
target: {
darwin: {
// Only supported on linux systems.
diff --git a/tests/Android.bp b/tests/Android.bp
index 693e3cf..778ead9 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -178,7 +178,6 @@
"liblog",
"libbase",
],
- host_ldlibs: ["-lrt"],
shared: {
enabled: false,
},
@@ -611,8 +610,6 @@
host_ldlibs: [
"-lresolv",
- "-lrt",
- "-ldl",
"-lutil",
],
diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index c1600cc..aa4d0dd 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -282,15 +282,6 @@
enabled: false,
},
},
-
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
cc_test_library {
@@ -307,15 +298,6 @@
enabled: false,
},
},
-
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
cc_test_library {
@@ -331,15 +313,6 @@
enabled: false,
},
},
-
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
// -----------------------------------------------------------------------------
@@ -416,15 +389,6 @@
defaults: ["bionic_testlib_defaults"],
srcs: ["dlsym_from_this_symbol.cpp"],
shared_libs: ["libtest_dlsym_from_this_child"],
-
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
// -----------------------------------------------------------------------------
@@ -433,14 +397,6 @@
defaults: ["bionic_testlib_defaults"],
srcs: ["dlsym_from_this_functions.cpp"],
shared_libs: ["libtest_dlsym_from_this_grandchild"],
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
// -----------------------------------------------------------------------------
@@ -475,15 +431,6 @@
name: "libtest_check_rtld_next_from_library",
defaults: ["bionic_testlib_defaults"],
srcs: ["check_rtld_next_from_library.cpp"],
-
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
// -----------------------------------------------------------------------------
@@ -493,14 +440,6 @@
name: "libtest_dlopen_from_ctor",
defaults: ["bionic_testlib_defaults"],
srcs: ["dlopen_testlib_dlopen_from_ctor.cpp"],
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
// -----------------------------------------------------------------------------