diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 0dd61bbb86..d1f52b32fe 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -152,29 +152,21 @@ config("common_config") {
     ]
   } else {
     if (is_posix) {
-      # -Wextra is currently disabled in Chromium"s common.gypi. Enable
-      # for targets that can handle it. For Android/arm64 right now
-      # there will be an "enumeral and non-enumeral type in conditional
-      # expression" warning in android_tools/ndk_experimental"s version
-      # of stlport.
-      # See: https://code.google.com/p/chromium/issues/detail?id=379699
-      if (current_cpu != "arm64" || !is_android) {
-        cflags = [
-          "-Wextra",
+      # Enable more warnings: -Wextra is currently disabled in Chromium.
+      cflags = [
+        "-Wextra",
 
-          # We need to repeat some flags from Chromium"s common.gypi
-          # here that get overridden by -Wextra.
-          "-Wno-unused-parameter",
-          "-Wno-missing-field-initializers",
-          "-Wno-strict-overflow",
-        ]
-        cflags_cc = [
-          "-Wnon-virtual-dtor",
+        # Repeat some flags that get overridden by -Wextra.
+        "-Wno-unused-parameter",
+        "-Wno-missing-field-initializers",
+        "-Wno-strict-overflow",
+      ]
+      cflags_cc = [
+        "-Wnon-virtual-dtor",
 
-          # This is enabled for clang; enable for gcc as well.
-          "-Woverloaded-virtual",
-        ]
-      }
+        # This is enabled for clang; enable for gcc as well.
+        "-Woverloaded-virtual",
+      ]
     }
 
     if (is_clang) {
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 304c933c38..9a79de9eb0 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -320,23 +320,13 @@
         ],
         'conditions': [
           ['os_posix==1', {
-            'conditions': [
-              # -Wextra is currently disabled in Chromium's common.gypi. Enable
-              # for targets that can handle it. For Android/arm64 right now
-              # there will be an 'enumeral and non-enumeral type in conditional
-              # expression' warning in android_tools/ndk_experimental's version
-              # of stlport.
-              # See: https://code.google.com/p/chromium/issues/detail?id=379699
-              ['target_arch!="arm64" or OS!="android"', {
-                'cflags': [
-                  '-Wextra',
-                  # We need to repeat some flags from Chromium's common.gypi
-                  # here that get overridden by -Wextra.
-                  '-Wno-unused-parameter',
-                  '-Wno-missing-field-initializers',
-                  '-Wno-strict-overflow',
-                ],
-              }],
+            # Enable more warnings: -Wextra is currently disabled in Chromium.
+            'cflags': [
+              '-Wextra',
+              # Repeat some flags that get overridden by -Wextra.
+              '-Wno-unused-parameter',
+              '-Wno-missing-field-initializers',
+              '-Wno-strict-overflow',
             ],
             'cflags_cc': [
               '-Wnon-virtual-dtor',