From 59eed5421c2ccb262d31c08e6d07535d76fe5688 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 13 Jul 2021 16:29:01 -0700
Subject: AOSP: Move system_shared_libs into target.bionic clause

Use target.bionic.system_shared_libs when it is used to limit the
default shared libraries (as opposed to remove them completely).
This avoids attempting to add a host dependency on libc when
system_shared_libs is modified to apply to all variants.

Also remove system_shared_libs from static binaries where it has
no effect, and consolidate it into e2fsprogs-defaults.

Bug: 193559105
Test: m checkbuild
Change-Id: I2d447b006afc783f4acd6c1acd93f338a68a01ed
From AOSP commit: 48fa7248112701c30d3cabfb8d3360b2408d6491
---
 Android.bp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index fa2d0153..e596664b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,9 @@ cc_defaults {
                 "-Wno-unused-variable",
             ],
         },
+        bionic: {
+            system_shared_libs: ["libc", "libdl"],
+        },
     },
 }
 
-- 
cgit v1.2.1