diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-29 14:58:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 14:58:41 +0000 |
| commit | 8ac3942d0ddd2d78de804d7089deda03045abee3 (patch) | |
| tree | 942722880fb3cdc164d167f7427aa4d4e95afbf5 | |
| parent | 04b9665845e2c7ebf7129686908484130c30f625 (diff) | |
| parent | af1809cd5cd006925646f8dad23da02f03fc8201 (diff) | |
| download | compiler-rt-8ac3942d0ddd2d78de804d7089deda03045abee3.tar.gz | |
Merge "Remove default libraries" am: 3f06d21426 am: 5f55d5cf5b
am: af1809cd5c
Change-Id: I9607a1b31c10cf410735736999b638aee53c8ea5
| -rw-r--r-- | Android.bp | 9 | ||||
| -rw-r--r-- | lib/asan/Android.bp | 5 | ||||
| -rw-r--r-- | lib/sanitizer_common/tests/Android.bp | 8 | ||||
| -rw-r--r-- | lib/tsan/Android.bp | 8 |
4 files changed, 1 insertions, 29 deletions
diff --git a/Android.bp b/Android.bp index 3dead1133..bda821c4c 100644 --- a/Android.bp +++ b/Android.bp @@ -364,15 +364,8 @@ cc_library { sdk_version: "21", target: { - not_windows: { - host_ldlibs: [ - "-lpthread", - "-lc", - "-lm", - ], - }, android: { - shared_libs: ["libdl", "liblog"], + shared_libs: ["liblog"], static_libs: ["liblzma"], }, android_arm: { diff --git a/lib/asan/Android.bp b/lib/asan/Android.bp index 047ba8cd8..d453d6338 100644 --- a/lib/asan/Android.bp +++ b/lib/asan/Android.bp @@ -294,11 +294,6 @@ cc_test { }, stl: "libc++", - target: { - host: { - host_ldlibs: ["-lrt"], - }, - }, } // ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional diff --git a/lib/sanitizer_common/tests/Android.bp b/lib/sanitizer_common/tests/Android.bp index ce7ebe7d6..2dd364223 100644 --- a/lib/sanitizer_common/tests/Android.bp +++ b/lib/sanitizer_common/tests/Android.bp @@ -64,10 +64,6 @@ cc_test_host { "sanitizer_thread_registry_test.cc", ], static_libs: ["libsan"], - host_ldlibs: [ - "-ldl", - "-lrt", - ], sanitize: { never: true, }, @@ -91,10 +87,6 @@ cc_binary_host { "-nostdlib", "-Qunused-arguments", ], - host_ldlibs: [ - "-ldl", - "-lrt", - ], sanitize: { never: true, }, diff --git a/lib/tsan/Android.bp b/lib/tsan/Android.bp index 23247d60b..79de623bd 100644 --- a/lib/tsan/Android.bp +++ b/lib/tsan/Android.bp @@ -97,10 +97,6 @@ cc_test_host { "libtsan", "libubsan", ], - host_ldlibs: [ - "-lrt", - "-ldl", - ], target: { darwin: { enabled: false, @@ -132,10 +128,6 @@ cc_test_host { "libtsan", "libubsan", ], - host_ldlibs: [ - "-lrt", - "-ldl", - ], target: { darwin: { enabled: false, |