diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-12-03 13:57:20 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-12-03 15:41:56 -0800 |
| commit | 6b3be172d6cf5fd29d7e1f825a1b0e589fdc72b2 (patch) | |
| tree | bf0dd5982e0a1c1fbce9d7a34135e9c927d011e8 /libdl | |
| parent | 9b849d6391a278e06e3c4b39cbee9d30916f51b2 (diff) | |
| download | bionic-6b3be172d6cf5fd29d7e1f825a1b0e589fdc72b2.tar.gz | |
Prevent dependency cycle due to system_shared_libs expansion
It was discovered that we were building some objects inconsistently due
to an optimization in cc_library to only build objects once and use them
for both the static and shared libraries. But static libraries didn't
get system_shared_libs set automatically, and we didn't notice that we
would have built the objects differently.
So static libraries now get the default system_shared_libs, we allow
adjusting that for static vs shared in a cc_library, and we disable the
optimization if the linked libraries are configured differently between
static and shared in a single cc_library.
This triggers dependency cycles for static libraries that libc/libdl
use, so fix those cycles here.
Test: treehugger
Change-Id: I3cf7fda161a05ec32e0c1e871999720d12a4d38e
Diffstat (limited to 'libdl')
| -rw-r--r-- | libdl/Android.bp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libdl/Android.bp b/libdl/Android.bp index 13c8714e6..656d3abfd 100644 --- a/libdl/Android.bp +++ b/libdl/Android.bp @@ -22,6 +22,7 @@ cc_library_static { include_dirs: ["bionic/libc"], stl: "none", + system_shared_libs: [], sanitize: { never: true, |