diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-07-22 19:12:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-22 19:12:23 +0000 |
| commit | ea1668c17bac6cc0bea4040a4dcfe59270852635 (patch) | |
| tree | ea87381d36fa4b4044c32f72fe6af87f5bc53657 | |
| parent | 292878fd3b6e2c6891b83de2579dde503c93fdaf (diff) | |
| parent | de7f10be9692656f990927746d6bccf137c657da (diff) | |
| download | e2fsprogs-ea1668c17bac6cc0bea4040a4dcfe59270852635.tar.gz | |
Merge "Move system_shared_libs into target.bionic clause" am: 956ab46122 am: 2d0e940e90 am: de7f10be96
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1765385
Change-Id: I049e147ed0665fb41733da8523d0a0382fa7d7ce
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | contrib/Android.bp | 1 | ||||
| -rw-r--r-- | debugfs/Android.bp | 1 | ||||
| -rw-r--r-- | e2fsck/Android.bp | 2 | ||||
| -rw-r--r-- | misc/Android.bp | 11 | ||||
| -rw-r--r-- | resize/Android.bp | 2 |
6 files changed, 3 insertions, 17 deletions
@@ -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 5fb5545b..7f9cfe96 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 dd146e4c..3a2f520b 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 9882172c..22396c4e 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 ca4267b8..78e18e42 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 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, } |