commit 31e0e11a8a457dcc7f634bee2d3ccc2aef1469a0
author Pirama Arumuga Nainar <pirama@google.com> Tue Jun 26 12:56:04 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 26 12:56:04 2018 -0700
tree aff581c13f0977e04affff4d9fe8aeb7fe967600
parent 5a3c4f5d21421c627e8fca5474a1a2e2e1ae4b6c
parent ad05929921321d68717a2e2ac2469b2da9b83b86

Update cflags for building Windows modules with Clang
am: 7982178b7b

Change-Id: If86618e7a224be98f38ac80588c7561838ff98b6

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index 97c9762..c0e4c57 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -19,17 +19,13 @@
         "-Wall",
         "-Wextra",
         "-Werror",
+        "-Wexit-time-destructors",
         "-Wno-unused-parameter",
         "-Wno-missing-field-initializers",
         "-Wvla",
     ],
     rtti: true,
 
-    clang_cflags: [
-        "-Wexit-time-destructors",
-        "-Wthread-safety",
-    ],
-
     use_version_lib: true,
 
     compile_multilib: "first",
@@ -85,6 +81,12 @@
                 "-luserenv",
             ],
         },
+
+        not_windows: {
+            cflags: [
+                "-Wthread-safety",
+            ],
+        },
     },
 }