AOSP: Moved contents of clang_cflags into cflags

Test: Treehugger
Bug: 226636335
Change-Id: If46f7b11aadcb29e33e36b67c56078ce5fa17b94
Fix AOSP commit: 19f3f24750096491b74d1f990adb617f3a5bba40

diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp
index eb5ae48..a401131 100644 (file)
--- 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 7be2d80..6f0620a 100644 (file)
--- 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 919adb1..365ca70 100644 (file)
--- 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"],
         },
     },