diff options
| author | Colin Cross <ccross@android.com> | 2021-07-13 16:29:01 -0700 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-07-27 12:31:55 -0400 |
| commit | 59eed5421c2ccb262d31c08e6d07535d76fe5688 (patch) | |
| tree | 272be536682adc2cf4f972bc780a0b26616c11d1 /resize | |
| parent | 3e3403d96d6c5ee27f6c53f885a99c34230ca40a (diff) | |
| download | e2fsprogs-59eed5421c2ccb262d31c08e6d07535d76fe5688.tar.gz | |
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
Diffstat (limited to 'resize')
| -rw-r--r-- | resize/Android.bp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/resize/Android.bp b/resize/Android.bp index fe72824c..ea6cf1e4 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, } |