elfutils: refactor transitive dependencies am: abb831b0b4 am: 066bf61494

Original change: https://android-review.googlesource.com/c/platform/external/elfutils/+/2826410

Change-Id: Iea966756faa64f2f09578cc35e876fc30da3269c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 1563dcd1..9146e4a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,8 +39,19 @@ license {
     ],
 }
 
+// Properties to apply to all static libraries that use elfutils.
+// Soong doesn't have propagation for static library dependencies,
+// and this have to be included explicitly by elfutils users.
+cc_defaults {
+    name: "elfutils_transitive_defaults",
+    static_libs: [
+        "libz",
+    ],
+}
+
 cc_defaults {
     name: "elfutils_defaults",
+    defaults: ["elfutils_transitive_defaults"],
     cflags: [
         "-DHAVE_CONFIG_H",
         "-D_GNU_SOURCE",
@@ -75,8 +86,6 @@ cc_library {
 
     srcs:  ["libelf/*.c",],
 
-    static_libs: ["libz"],
-
     export_include_dirs: ["libelf"],
 
     target: {
@@ -139,7 +148,6 @@ cc_library_host_static {
         musl: {
             static_libs: [
                 "libfts",
-                "libz",
             ],
         },
     },