From 23081a924a098243730d721f941c032ca4addf3a Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 30 Jan 2023 19:04:32 +0000 Subject: [PATCH] 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 --- Android.bp | 3 +++ lib/blkid/Android.bp | 1 - lib/e2p/Android.bp | 1 - lib/ext2fs/Android.bp | 1 - lib/uuid/Android.bp | 1 - misc/Android.bp | 2 -- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Android.bp b/Android.bp index e596664..25755d9 100644 --- a/Android.bp +++ b/Android.bp @@ -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 66d587b..db6da1e 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 050d869..bf3ec7d 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 3dde692..465dd55 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 daf30bb..e45251b 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 63347b2..12b3e25 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 }, -- 1.8.3.1