diff options
| author | Alix Espino <agespino@google.com> | 2022-04-27 19:20:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-27 19:20:24 +0000 |
| commit | a88e1085fe6a6113fee8c3c18a39134d5b8156d1 (patch) | |
| tree | f09ab3df05a7253ec608a592c3baea97384a0a1b | |
| parent | a6f2586b470c96ed917ae56f2c84c6deaf8cfc31 (diff) | |
| parent | b65c390db7f2f09716add7c587b4650545f94732 (diff) | |
| download | e2fsprogs-a88e1085fe6a6113fee8c3c18a39134d5b8156d1.tar.gz | |
Merge "Moved contents of clang_cflags into cflags" am: a577a51617 am: f1b0b6929d am: b65c390db7
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2069512
Change-Id: I924b8cef32f7cdf292798187c7c24905a8c23cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | lib/blkid/Android.bp | 7 | ||||
| -rw-r--r-- | lib/e2p/Android.bp | 5 | ||||
| -rw-r--r-- | lib/ext2fs/Android.bp | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp index eb5ae48a..a4011319 100644 --- a/lib/blkid/Android.bp +++ b/lib/blkid/Android.bp @@ -39,15 +39,14 @@ cc_library { target: { windows: { - include_dirs: [ "external/e2fsprogs/include/mingw" ], + include_dirs: ["external/e2fsprogs/include/mingw"], cflags: [ "-Wno-pointer-to-int-cast", "-Wno-unused-variable", - ], - clang_cflags: [ "-Wno-error=typedef-redefinition", ], - enabled: true + + enabled: true, }, }, diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp index 7be2d804..6f0620af 100644 --- a/lib/e2p/Android.bp +++ b/lib/e2p/Android.bp @@ -53,14 +53,13 @@ cc_library { target: { windows: { - include_dirs: [ "external/e2fsprogs/include/mingw" ], + include_dirs: ["external/e2fsprogs/include/mingw"], enabled: true, cflags: [ "-Wno-unused-variable", - ], - clang_cflags: [ "-Wno-error=typedef-redefinition", ], + host_ldlibs: [ "-lws2_32", ], diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index 919adb13..365ca709 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -115,19 +115,18 @@ cc_library { cflags: ["-Wno-unused-parameter"], target: { android: { - shared_libs: [ "libext2_uuid" ], + shared_libs: ["libext2_uuid"], }, windows: { enabled: true, - include_dirs: [ "external/e2fsprogs/include/mingw" ], + include_dirs: ["external/e2fsprogs/include/mingw"], cflags: [ "-Wno-error=cpp", "-Wno-format", "-Wno-unused-variable", - ], - clang_cflags: [ "-Wno-error=typedef-redefinition", ], + host_ldlibs: ["-lws2_32"], }, }, |