Merge "Remove default libraries"

aosp-ginkgo · Sep 30, 2017 · 8b7feee · 8b7feee
2 parents e80beca + 1e45d53
commit 8b7feee
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 52 deletions.
diff --git a/base/Android.bp b/base/Android.bp
@@ -95,7 +95,6 @@ cc_library {
                 "errors_unix.cpp",
             ],
             cppflags: ["-Wexit-time-destructors"],
-            host_ldlibs: ["-lrt"],
         },
         windows: {
             srcs: [
@@ -138,7 +137,6 @@ cc_test {
         },
         linux: {
             srcs: ["chrono_utils_test.cpp"],
-            host_ldlibs: ["-lrt"],
         },
         windows: {
             srcs: ["utf8_test.cpp"],

diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
@@ -94,7 +94,6 @@ cc_library {
             ],
 
             static_libs: ["libcutils"],
-            host_ldlibs: ["-lrt"],
         },
         linux_bionic: {
             enabled: true,
@@ -229,15 +228,11 @@ cc_test {
         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
@@ -91,9 +91,6 @@ cc_library {
         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
@@ -22,13 +22,6 @@ cc_library {
     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
@@ -25,14 +25,6 @@ cc_defaults {
     ],
     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
@@ -11,14 +11,6 @@ cc_library {
         "libnativebridge",
         "libbase",
     ],
-    target: {
-        android: {
-            shared_libs: ["libdl"],
-        },
-        host: {
-            host_ldlibs: ["-ldl"],
-        },
-    },
     cflags: [
         "-Werror",
         "-Wall",
@@ -27,5 +19,4 @@ cc_library {
         "-fvisibility=hidden",
     ],
     export_include_dirs: ["include"],
-    local_include_dirs: ["include"],
 }
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
@@ -143,14 +143,6 @@ cc_test {
         "libgmock",
     ],
 
-    target: {
-        linux: {
-            host_ldlibs: [
-                "-lrt",
-            ],
-        },
-    },
-
     data: [
         "tests/files/elf32.xz",
         "tests/files/elf64.xz",
@@ -178,14 +170,6 @@ cc_binary {
     srcs: [
         "tools/unwind.cpp",
     ],
-
-    target: {
-        linux: {
-            host_ldlibs: [
-                "-lrt",
-            ],
-        },
-    },
 }
 
 cc_binary {

diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp
@@ -44,7 +44,6 @@ cc_test {
                 "libcutils",
                 "libutils",
                 "libbase",
-                "libdl",
             ],
         },
         linux: {
@@ -59,7 +58,6 @@ cc_test {
                 "liblog",
                 "libbase",
             ],
-            host_ldlibs: ["-ldl"],
         },
     },