diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 05e2e19306..40368597b2 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -153,10 +153,7 @@ config("common_config") {
     }
   }
 
-  # TODO(kjellander): Handle warnings on Windows where WebRTC differ from the
-  # default warnings set in build/config/compiler/BUILD.gn.
-
-  if (is_android && is_clang) {
+  if (is_android && !is_clang) {
     # The Android NDK doesn"t provide optimized versions of these
     # functions. Ensure they are disabled for all compilers.
     cflags += [
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 9335d35e06..5caa6cc10c 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -372,7 +372,7 @@
           'WEBRTC_ANDROID',
          ],
          'conditions': [
-           ['clang!=1', {
+           ['clang==0', {
              # The Android NDK doesn't provide optimized versions of these
              # functions. Ensure they are disabled for all compilers.
              'cflags': [