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: [PATCH] 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 +++
 contrib/Android.bp |  1 -
 debugfs/Android.bp |  1 -
 e2fsck/Android.bp  |  2 --
 misc/Android.bp    | 11 -----------
 resize/Android.bp  |  2 --
 6 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/Android.bp b/Android.bp
index fa2d015..e596664 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,9 @@ cc_defaults {
                 "-Wno-unused-variable",
             ],
         },
+        bionic: {
+            system_shared_libs: ["libc", "libdl"],
+        },
     },
 }
 
diff --git a/contrib/Android.bp b/contrib/Android.bp
index 5fb5545..7f9cfe9 100644
--- a/contrib/Android.bp
+++ b/contrib/Android.bp
@@ -25,5 +25,4 @@ cc_binary {
         "libext2fs",
         "libext2_com_err",
     ],
-    system_shared_libs: ["libc", "libdl"],
 }
diff --git a/debugfs/Android.bp b/debugfs/Android.bp
index dd146e4..3a2f520 100644
--- a/debugfs/Android.bp
+++ b/debugfs/Android.bp
@@ -70,7 +70,6 @@ cc_binary {
     defaults: ["debugfs-defaults"],
 
     shared_libs: debugfs_libs,
-    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp
index 9882172..22396c4 100644
--- a/e2fsck/Android.bp
+++ b/e2fsck/Android.bp
@@ -69,7 +69,6 @@ cc_binary {
     defaults: ["e2fsck-defaults"],
 
     shared_libs: e2fsck_libs,
-    system_shared_libs: ["libc", "libdl"],
     required: ["badblocks"],
 }
 
@@ -87,6 +86,5 @@ cc_binary {
     static_executable: true,
     ramdisk: true,
     defaults: ["e2fsck-defaults"],
-    system_shared_libs: [],
     static_libs: e2fsck_libs,
 }
diff --git a/misc/Android.bp b/misc/Android.bp
index ca4267b..78e18e4 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -37,7 +37,6 @@ cc_library {
         "libext2_com_err",
         "libext2_quota",
     ],
-    system_shared_libs: ["libc", "libdl"],
     export_include_dirs: ["."],
 }
 
@@ -145,7 +144,6 @@ cc_binary {
     defaults: ["tune2fs-defaults"],
 
     shared_libs: tune2fs_libs,
-    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
@@ -162,7 +160,6 @@ cc_binary {
     static_executable: true,
     ramdisk: true,
     defaults: ["tune2fs-defaults"],
-    system_shared_libs: [],
     static_libs: tune2fs_libs,
 }
 
@@ -190,7 +187,6 @@ cc_binary {
         "libext2_blkid",
         "libext2_e2p",
     ],
-    system_shared_libs: ["libc", "libdl"],
 }
 
 //########################################################################
@@ -206,7 +202,6 @@ cc_binary {
         "libext2_com_err",
         "libext2_e2p",
     ],
-    system_shared_libs: ["libc", "libdl"],
 }
 
 //########################################################################
@@ -229,7 +224,6 @@ cc_binary {
     defaults: ["lsattr-defaults"],
 
     shared_libs: lsattr_libs,
-    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
@@ -254,7 +248,6 @@ cc_binary {
         "libext2_com_err",
         "libext2_e2p",
     ],
-    system_shared_libs: ["libc", "libdl"],
 }
 
 //########################################################################
@@ -270,7 +263,6 @@ cc_binary {
         "libext2fs",
         "libext2_uuid",
     ],
-    system_shared_libs: ["libc", "libdl"],
 
     target: {
         darwin: {
@@ -294,7 +286,6 @@ cc_binary {
         "libext2_com_err",
         "libext2_quota",
     ],
-    system_shared_libs: ["libc", "libdl"],
 }
 
 //##########################################################################
@@ -309,7 +300,6 @@ cc_binary {
     shared_libs: [
         "libext2fs",
     ],
-    system_shared_libs: ["libc", "libdl"],
 }
 
 //##########################################################################
@@ -328,5 +318,4 @@ cc_binary {
         "libext2fs",
         "libext2_com_err",
     ],
-    system_shared_libs: ["libc", "libdl"],
 }
diff --git a/resize/Android.bp b/resize/Android.bp
index fe72824..ea6cf1e 100644
--- a/resize/Android.bp
+++ b/resize/Android.bp
@@ -46,7 +46,6 @@ cc_binary {
             shared_libs: resize2fs_libs,
         },
     },
-    system_shared_libs: ["libc", "libdl"],
 }
 
 cc_binary {
@@ -55,6 +54,5 @@ cc_binary {
     static_executable: true,
     ramdisk: true,
     defaults: ["resize2fs-defaults"],
-    system_shared_libs: [],
     static_libs: resize2fs_libs,
 }
-- 
1.8.3.1