diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-29 09:39:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 09:39:45 +0000 |
| commit | bee23587eba39214a0dc351b94d407fb22c618ad (patch) | |
| tree | 46deb153b69152989e4fd09bf7198306af9f20c4 | |
| parent | c6ab766458e8ca714475330b445fb4c8b681d09c (diff) | |
| parent | bbe7bb92eea6c3062b216be8d1d3fac14a62b2fa (diff) | |
| download | clang-bee23587eba39214a0dc351b94d407fb22c618ad.tar.gz | |
Merge "Remove default libraries"
am: bbe7bb92ee
Change-Id: I2d72f1b73ccff3fd6656a42ab42ee739c8191e0c
| -rw-r--r-- | Android.bp | 15 | ||||
| -rw-r--r-- | tools/clang-check/Android.bp | 14 | ||||
| -rw-r--r-- | tools/clang-format/Android.bp | 14 | ||||
| -rw-r--r-- | tools/driver/Android.bp | 14 | ||||
| -rw-r--r-- | utils/TableGen/Android.bp | 13 |
5 files changed, 1 insertions, 69 deletions
diff --git a/Android.bp b/Android.bp index dedb73a9c7..a29f92c86d 100644 --- a/Android.bp +++ b/Android.bp @@ -221,21 +221,8 @@ cc_defaults { "-lversion", ], }, - darwin: { + not_windows: { shared_libs: ["libc++"], - - host_ldlibs: [ - "-ldl", - "-lpthread", - ], - }, - linux: { - shared_libs: ["libc++"], - - host_ldlibs: [ - "-ldl", - "-lpthread", - ], }, }, diff --git a/tools/clang-check/Android.bp b/tools/clang-check/Android.bp index f23c21ffe1..3f4036f585 100644 --- a/tools/clang-check/Android.bp +++ b/tools/clang-check/Android.bp @@ -91,19 +91,5 @@ clang_binary_host { "-lversion", ], }, - darwin: { - host_ldlibs: [ - "-lm", - "-lpthread", - "-ldl", - ], - }, - linux: { - host_ldlibs: [ - "-lm", - "-lpthread", - "-ldl", - ], - }, }, } diff --git a/tools/clang-format/Android.bp b/tools/clang-format/Android.bp index b618e140f4..b09d955285 100644 --- a/tools/clang-format/Android.bp +++ b/tools/clang-format/Android.bp @@ -88,19 +88,5 @@ clang_binary_host { "-lversion", ], }, - darwin: { - host_ldlibs: [ - "-lm", - "-lpthread", - "-ldl", - ], - }, - linux: { - host_ldlibs: [ - "-lm", - "-lpthread", - "-ldl", - ], - }, }, } diff --git a/tools/driver/Android.bp b/tools/driver/Android.bp index 17ab1e5bce..48d2c8e6ba 100644 --- a/tools/driver/Android.bp +++ b/tools/driver/Android.bp @@ -89,20 +89,6 @@ clang_binary_host { "-lversion", ], }, - darwin: { - host_ldlibs: [ - "-lm", - "-lpthread", - "-ldl", - ], - }, - linux: { - host_ldlibs: [ - "-lm", - "-lpthread", - "-ldl", - ], - }, }, symlinks: ["clang++"], diff --git a/utils/TableGen/Android.bp b/utils/TableGen/Android.bp index cd86cbc16f..fd47688c76 100644 --- a/utils/TableGen/Android.bp +++ b/utils/TableGen/Android.bp @@ -11,7 +11,6 @@ cc_binary_host { tidy_checks: [ "-google-runtime-member-string-references", ], - host_ldlibs: ["-lm"], target: { windows: { host_ldlibs: [ @@ -20,17 +19,5 @@ cc_binary_host { "-lversion", ], }, - darwin: { - host_ldlibs: [ - "-lpthread", - "-ldl", - ], - }, - linux: { - host_ldlibs: [ - "-lpthread", - "-ldl", - ], - }, }, } |