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

diff --git a/Android.bp b/Android.bp
index e596664bfbd27c38421d09724f496eb7660fcb23..25755d9effb488f12cca25f348ea44bfba687680 100644 (file)
--- 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 66d587b4bb0b60105b8dec9334c1af79e39ff01a..db6da1e2967c3e6312ce7dc3ed44f70b8a6a398a 100644 (file)
--- 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 050d869b367f7316a96e8f1161edc871efda775a..bf3ec7d4d9f700f0dcb55203f2896adc6665d280 100644 (file)
--- 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 3dde692d464adf31ba56eb4d9780129ca012ce90..465dd552e78a38d3e67a726b5b5765ea16733bd5 100644 (file)
--- 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 daf30bb94b72731293fa0cf01dc5bf84a9309eb2..e45251b858b10e25398408c0e731d00473d90c5d 100644 (file)
--- 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 63347b24bf991516f83849259a65d46d6cf5a0cd..12b3e25926ce9dcc2cdca427a5075b6c092de39f 100644 (file)
--- 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
         },