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
"-Wno-unused-variable",
],
},
"-Wno-unused-variable",
],
},
+ bionic: {
+ system_shared_libs: ["libc", "libdl"],
+ },
"libext2fs",
"libext2_com_err",
],
"libext2fs",
"libext2_com_err",
],
- system_shared_libs: ["libc", "libdl"],
defaults: ["debugfs-defaults"],
shared_libs: debugfs_libs,
defaults: ["debugfs-defaults"],
shared_libs: debugfs_libs,
- system_shared_libs: ["libc", "libdl"],
defaults: ["e2fsck-defaults"],
shared_libs: e2fsck_libs,
defaults: ["e2fsck-defaults"],
shared_libs: e2fsck_libs,
- system_shared_libs: ["libc", "libdl"],
required: ["badblocks"],
}
required: ["badblocks"],
}
static_executable: true,
ramdisk: true,
defaults: ["e2fsck-defaults"],
static_executable: true,
ramdisk: true,
defaults: ["e2fsck-defaults"],
- system_shared_libs: [],
static_libs: e2fsck_libs,
}
static_libs: e2fsck_libs,
}
"libext2_com_err",
"libext2_quota",
],
"libext2_com_err",
"libext2_quota",
],
- system_shared_libs: ["libc", "libdl"],
export_include_dirs: ["."],
}
export_include_dirs: ["."],
}
defaults: ["tune2fs-defaults"],
shared_libs: tune2fs_libs,
defaults: ["tune2fs-defaults"],
shared_libs: tune2fs_libs,
- system_shared_libs: ["libc", "libdl"],
static_executable: true,
ramdisk: true,
defaults: ["tune2fs-defaults"],
static_executable: true,
ramdisk: true,
defaults: ["tune2fs-defaults"],
- system_shared_libs: [],
static_libs: tune2fs_libs,
}
static_libs: tune2fs_libs,
}
"libext2_blkid",
"libext2_e2p",
],
"libext2_blkid",
"libext2_e2p",
],
- system_shared_libs: ["libc", "libdl"],
}
//########################################################################
}
//########################################################################
"libext2_com_err",
"libext2_e2p",
],
"libext2_com_err",
"libext2_e2p",
],
- system_shared_libs: ["libc", "libdl"],
}
//########################################################################
}
//########################################################################
defaults: ["lsattr-defaults"],
shared_libs: lsattr_libs,
defaults: ["lsattr-defaults"],
shared_libs: lsattr_libs,
- system_shared_libs: ["libc", "libdl"],
"libext2_com_err",
"libext2_e2p",
],
"libext2_com_err",
"libext2_e2p",
],
- system_shared_libs: ["libc", "libdl"],
}
//########################################################################
}
//########################################################################
"libext2fs",
"libext2_uuid",
],
"libext2fs",
"libext2_uuid",
],
- system_shared_libs: ["libc", "libdl"],
"libext2_com_err",
"libext2_quota",
],
"libext2_com_err",
"libext2_quota",
],
- system_shared_libs: ["libc", "libdl"],
}
//##########################################################################
}
//##########################################################################
shared_libs: [
"libext2fs",
],
shared_libs: [
"libext2fs",
],
- system_shared_libs: ["libc", "libdl"],
}
//##########################################################################
}
//##########################################################################
"libext2fs",
"libext2_com_err",
],
"libext2fs",
"libext2_com_err",
],
- system_shared_libs: ["libc", "libdl"],
shared_libs: resize2fs_libs,
},
},
shared_libs: resize2fs_libs,
},
},
- system_shared_libs: ["libc", "libdl"],
static_executable: true,
ramdisk: true,
defaults: ["resize2fs-defaults"],
static_executable: true,
ramdisk: true,
defaults: ["resize2fs-defaults"],
- system_shared_libs: [],
static_libs: resize2fs_libs,
}
static_libs: resize2fs_libs,
}