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
Change-Id: I0b3c147b00a8ab6ff289b85db55b88836c905f5c
Exempt-From-Owner-Approval: build system cleanup
diff --git a/base/Android.bp b/base/Android.bp
index 82aee2a..da262d2 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -95,7 +95,6 @@
"errors_unix.cpp",
],
cppflags: ["-Wexit-time-destructors"],
- host_ldlibs: ["-lrt"],
},
windows: {
srcs: [
@@ -138,7 +137,6 @@
},
linux: {
srcs: ["chrono_utils_test.cpp"],
- host_ldlibs: ["-lrt"],
},
windows: {
srcs: ["utf8_test.cpp"],
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index e889bdd..69d7b6d 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -94,7 +94,6 @@
],
static_libs: ["libcutils"],
- host_ldlibs: ["-lrt"],
},
linux_bionic: {
enabled: true,
@@ -229,15 +228,11 @@
android: {
cflags: ["-DENABLE_PSS_TESTS"],
shared_libs: [
- "libdl",
"libutils",
],
},
linux: {
host_ldlibs: [
- "-lpthread",
- "-lrt",
- "-ldl",
"-lncurses",
],
static_libs: ["libutils"],
diff --git a/liblog/Android.bp b/liblog/Android.bp
index b98d18f..d5bb29e 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -91,9 +91,6 @@
not_windows: {
srcs: ["event_tag_map.cpp"],
},
- linux: {
- host_ldlibs: ["-lrt"],
- },
linux_bionic: {
enabled: true,
},
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index b3c42f0..089f3b8 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -22,13 +22,6 @@
cppflags: [
"-fvisibility=protected",
],
-
- host_ldlibs: ["-ldl"],
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- },
}
subdirs = ["tests"]
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp
index e31dae0..9e2e641 100644
--- a/libnativebridge/tests/Android.bp
+++ b/libnativebridge/tests/Android.bp
@@ -25,14 +25,6 @@
],
header_libs: ["libnativebridge-dummy-headers"],
cppflags: ["-fvisibility=protected"],
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
}
cc_library_shared {
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 13f9744..4b21edc 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -11,14 +11,6 @@
"libnativebridge",
"libbase",
],
- target: {
- android: {
- shared_libs: ["libdl"],
- },
- host: {
- host_ldlibs: ["-ldl"],
- },
- },
cflags: [
"-Werror",
"-Wall",
@@ -27,5 +19,4 @@
"-fvisibility=hidden",
],
export_include_dirs: ["include"],
- local_include_dirs: ["include"],
}
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index ca05516..cf2ac4e 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -143,14 +143,6 @@
"libgmock",
],
- target: {
- linux: {
- host_ldlibs: [
- "-lrt",
- ],
- },
- },
-
data: [
"tests/files/elf32.xz",
"tests/files/elf64.xz",
@@ -178,14 +170,6 @@
srcs: [
"tools/unwind.cpp",
],
-
- target: {
- linux: {
- host_ldlibs: [
- "-lrt",
- ],
- },
- },
}
cc_binary {
diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp
index 0869175..3fadef4 100644
--- a/libutils/tests/Android.bp
+++ b/libutils/tests/Android.bp
@@ -44,7 +44,6 @@
"libcutils",
"libutils",
"libbase",
- "libdl",
],
},
linux: {
@@ -59,7 +58,6 @@
"liblog",
"libbase",
],
- host_ldlibs: ["-ldl"],
},
},