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: I75cd76db2366179c7e38578210db728e6181442c

1 files changed, 1 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index bee6efa3..b0ae3675 100644
--- a/Android.bp
+++ b/Android.bp
@@ -158,6 +158,7 @@ cc_library {
             shared: {
                 enabled: false,
             },
+            system_shared_libs: [],
         },
     },
 }