diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-01-30 19:04:32 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-02-01 00:21:27 -0500 |
| commit | 23081a924a098243730d721f941c032ca4addf3a (patch) | |
| tree | e1a29e1e861efc1b81ec5c03779ccb953991969e | |
| parent | 62267969523e27604806cb6b149cbf5e0019cf79 (diff) | |
| download | e2fsprogs-23081a924a098243730d721f941c032ca4addf3a.tar.gz | |
AOSP: Android: consolidate addition of include/mingw/
To match what the autotools-based build system does now, always add
include/mingw/ to the include path on Windows. I don't think this makes
a real difference anywhere, but this is much simpler.
Change-Id: I92fdaf3e58029dfca3187af928d943270b2a2109
From AOSP commit: c9aa74eac41f8feeabb2321383161c7cf92cb49b
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | lib/blkid/Android.bp | 1 | ||||
| -rw-r--r-- | lib/e2p/Android.bp | 1 | ||||
| -rw-r--r-- | lib/ext2fs/Android.bp | 1 | ||||
| -rw-r--r-- | lib/uuid/Android.bp | 1 | ||||
| -rw-r--r-- | misc/Android.bp | 2 |
6 files changed, 3 insertions, 6 deletions
@@ -58,6 +58,9 @@ cc_defaults { bionic: { system_shared_libs: ["libc", "libdl"], }, + windows: { + include_dirs: ["external/e2fsprogs/include/mingw"], + }, }, } diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp index 66d587b4..db6da1e2 100644 --- a/lib/blkid/Android.bp +++ b/lib/blkid/Android.bp @@ -39,7 +39,6 @@ cc_library { target: { windows: { - include_dirs: ["external/e2fsprogs/include/mingw"], cflags: [ "-Wno-pointer-to-int-cast", "-Wno-error=typedef-redefinition", diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp index 050d869b..bf3ec7d4 100644 --- a/lib/e2p/Android.bp +++ b/lib/e2p/Android.bp @@ -53,7 +53,6 @@ cc_library { target: { windows: { - include_dirs: ["external/e2fsprogs/include/mingw"], enabled: true, cflags: [ "-Wno-unused-variable", diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index 3dde692d..465dd552 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -121,7 +121,6 @@ cc_library { enabled: true, srcs: ["windows_io.c"], exclude_srcs: ["unix_io.c"], - include_dirs: ["external/e2fsprogs/include/mingw"], cflags: [ "-Wno-format", "-Wno-unused-variable", diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp index daf30bb9..e45251b8 100644 --- a/lib/uuid/Android.bp +++ b/lib/uuid/Android.bp @@ -45,7 +45,6 @@ cc_library { ], target: { windows: { - include_dirs: [ "external/e2fsprogs/include/mingw" ], enabled: true }, }, diff --git a/misc/Android.bp b/misc/Android.bp index 63347b24..12b3e259 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -22,7 +22,6 @@ cc_library { target: { windows: { - include_dirs: [ "external/e2fsprogs/include/mingw" ], enabled: true, cflags: ["-Wno-unused-variable"], }, @@ -89,7 +88,6 @@ cc_binary { ], }, windows: { - include_dirs: [ "external/e2fsprogs/include/mingw" ], ldflags: ["-static"], enabled: true }, |