Do not use whole_static_libs and shared_libs at the same time. Fix
up clients.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Bug:
123590866
Test: mmma external/e2fsprogs
Change-Id: I36d184dd878de2beacbb17c306e47076b44d68bb
From AOSP commit:
fece156b105719c782351e447298de073d4dab04
e2fsck_libs = [
"libext2fs",
"libext2_blkid",
+ "libext2_com_err",
"libext2_uuid",
"libext2_quota",
"libext2_e2p",
"test_io.c",
],
shared_libs: [
+ "libext2_com_err",
"libsparse",
"libz",
],
- whole_static_libs: [
- "libext2_com_err"
- ],
cflags: ["-Wno-unused-parameter"],
target: {
- host: {
- // Consider removing this library as a whole for the host. It is not
- // in the android side.
- whole_static_libs: ["libext2_com_err"],
- },
android: {
- shared_libs: [
- "libext2_com_err",
- "libext2_uuid",
- ],
+ shared_libs: [ "libext2_uuid" ],
},
windows: {
enabled: true,
shared_libs: [
"libext2fs",
"libext2_blkid",
+ "libext2_com_err",
],
target: {
],
cflags: ["-Wno-error=format-extra-args"],
shared_libs: [
- "libext2_quota",
"libext2fs",
+ "libext2_com_err",
+ "libext2_quota",
],
system_shared_libs: ["libc", "libdl"],
export_include_dirs: ["."],
tune2fs_libs = [
"libext2_blkid",
+ "libext2_com_err",
"libext2_quota",
"libext2_uuid",
"libext2_e2p",
],
shared_libs: [
"libext2fs",
+ "libext2_com_err",
"libext2_e2p",
"libext2_uuid",
"libext2_blkid",