diff options
| author | Andreas Gampe <agampe@google.com> | 2019-01-30 10:56:56 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-30 10:56:56 -0800 |
| commit | fcc3123ad58aec7f4c9964991866bfc760bceb8c (patch) | |
| tree | 12ca2acaa9e98773ca94c067e47d95bd563a7d47 | |
| parent | f000c43073685972da48fe21a948607bcdf6529e (diff) | |
| parent | 0a3189f2bda634bead168fdd7064b89ed9b7eff3 (diff) | |
| download | android_external_e2fsprogs-fcc3123ad58aec7f4c9964991866bfc760bceb8c.tar.gz android_external_e2fsprogs-fcc3123ad58aec7f4c9964991866bfc760bceb8c.tar.bz2 android_external_e2fsprogs-fcc3123ad58aec7f4c9964991866bfc760bceb8c.zip | |
Merge "E2fsprogs: fix ODR issue" am: 2073e2bf4d am: f1714a3335
am: 0a3189f2bd
Change-Id: Icea10f40ae83800febc1d0e045e96abe790ba699
| -rw-r--r-- | e2fsck/Android.bp | 1 | ||||
| -rw-r--r-- | lib/ext2fs/Android.bp | 14 | ||||
| -rw-r--r-- | lib/support/Android.bp | 1 | ||||
| -rw-r--r-- | misc/Android.bp | 4 | ||||
| -rw-r--r-- | resize/Android.bp | 1 |
5 files changed, 8 insertions, 13 deletions
diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp index f3f70a0a..f3443127 100644 --- a/e2fsck/Android.bp +++ b/e2fsck/Android.bp @@ -44,6 +44,7 @@ cc_defaults { e2fsck_libs = [ "libext2fs", "libext2_blkid", + "libext2_com_err", "libext2_uuid", "libext2_quota", "libext2_e2p", diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index 5d10d3f7..e09ec3fb 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -91,24 +91,14 @@ cc_library { "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, diff --git a/lib/support/Android.bp b/lib/support/Android.bp index 894d3357..2bc07b7f 100644 --- a/lib/support/Android.bp +++ b/lib/support/Android.bp @@ -21,6 +21,7 @@ cc_library { shared_libs: [ "libext2fs", "libext2_blkid", + "libext2_com_err", ], target: { diff --git a/misc/Android.bp b/misc/Android.bp index 301ce5d9..dea2f9fe 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -21,8 +21,9 @@ cc_library { ], cflags: ["-Wno-error=format-extra-args"], shared_libs: [ - "libext2_quota", "libext2fs", + "libext2_com_err", + "libext2_quota", ], system_shared_libs: ["libc", "libdl"], export_include_dirs: ["."], @@ -118,6 +119,7 @@ cc_defaults { tune2fs_libs = [ "libext2_blkid", + "libext2_com_err", "libext2_quota", "libext2_uuid", "libext2_e2p", diff --git a/resize/Android.bp b/resize/Android.bp index 22d2408d..d55e24c2 100644 --- a/resize/Android.bp +++ b/resize/Android.bp @@ -15,6 +15,7 @@ cc_binary { ], shared_libs: [ "libext2fs", + "libext2_com_err", "libext2_e2p", "libext2_uuid", "libext2_blkid", |