From d3825898da0a4871c5e7920516ed723f9f527eec Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 3 Dec 2018 15:50:00 -0800 Subject: [PATCH] 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: I6ec2ea45292b602d5c506560de8b8d6ae725be6f --- property_service/libpropertyinfoparser/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/property_service/libpropertyinfoparser/Android.bp b/property_service/libpropertyinfoparser/Android.bp index 70f6faab5..6637deb05 100644 --- a/property_service/libpropertyinfoparser/Android.bp +++ b/property_service/libpropertyinfoparser/Android.bp @@ -12,5 +12,6 @@ cc_library_static { "-Werror", ], stl: "none", + system_shared_libs: [], export_include_dirs: ["include"], }