Fix automatically extracted defaults

Fix generate_bp.py to automatically generate the defaults modules
based on flags that are set in all targets.  Use lists instead of
sets for the flags to maintain the order they were specified in
the project*.json files as much as possible.

Test: android_tools/generate_android_bp.sh
Test: mma
Change-Id: I29e13367e8e49660edeaa6462ddbab76aa177c88

2 files changed, 140 insertions, 1095 deletions

diff --git a/Android.bp b/Android.bp
index 53e51a60f0..8ca1d6c206 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,8 +53,29 @@ cc_defaults {
         "third_party/crc32c/src/include",
     ],
     cflags: [
-        "-DABSL_ALLOCATOR_NOTHROW=1",
+        "-Wextra",
+        "-Wno-unused-parameter",
+        "-Wshadow",
+        "-Wstring-conversion",
+        "-Wexit-time-destructors",
+        "-Wglobal-constructors",
+        "-Wno-shadow",
+        "-Wctad-maybe-unsupported",
+        "-Wc++11-narrowing",
+        "-Wundef",
+        "-Wunused-lambda-capture",
+        "-DWEBRTC_ENABLE_PROTOBUF=0",
+        "-DWEBRTC_STRICT_FIELD_TRIALS=0",
+        "-DWEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
         "-DRTC_ENABLE_VP9",
+        "-DWEBRTC_HAVE_SCTP",
+        "-DWEBRTC_LIBRARY_IMPL",
+        "-DWEBRTC_ENABLE_AVX2",
+        "-DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1",
+        "-DWEBRTC_POSIX",
+        "-DWEBRTC_LINUX",
+        "-DABSL_ALLOCATOR_NOTHROW=1",
+        "-DHAVE_ARM64_CRC32C=0",
         "-DUSE_AURA=1",
         "-DUSE_GLIB=1",
         "-DUSE_NSS_CERTS=1",
@@ -62,15 +83,6 @@ cc_defaults {
         "-DUSE_X11=1",
         "-DWEBRTC_ANDROID_PLATFORM_BUILD=1",
         "-DWEBRTC_APM_DEBUG_DUMP=0",
-        "-DWEBRTC_ENABLE_AVX2",
-        "-DWEBRTC_ENABLE_PROTOBUF=0",
-        "-DWEBRTC_HAVE_SCTP",
-        "-DWEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE",
-        "-DWEBRTC_LIBRARY_IMPL",
-        "-DWEBRTC_LINUX",
-        "-DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1",
-        "-DWEBRTC_POSIX",
-        "-DWEBRTC_STRICT_FIELD_TRIALS=0",
         "-D_FILE_OFFSET_BITS=64",
         "-D_GNU_SOURCE",
         "-D_LARGEFILE64_SOURCE",
@@ -82,8 +94,13 @@ cc_defaults {
         "-Wno-missing-field-initializers",
         "-Wno-unreachable-code-aggressive",
         "-Wno-unreachable-code-break",
-        "-Wno-unused-parameter",
-        "-msse3",
+    ],
+    conlyflags: [
+        "-Wstrict-prototypes",
+    ],
+    cppflags: [
+        "-Wnon-virtual-dtor",
+        "-Woverloaded-virtual",
     ],
     header_libs: [
         "libwebrtc_absl_headers",
@@ -115,38 +132,38 @@ cc_defaults {
     arch: {
         arm: {
             cflags: [
-                "-DHAVE_ARM64_CRC32C=0",
+                "-mfpu=neon",
                 "-DWEBRTC_ARCH_ARM",
                 "-DWEBRTC_ARCH_ARM_V7",
                 "-DWEBRTC_HAS_NEON",
-                "-mfpu=neon",
                 "-mthumb",
             ],
+            asflags: [
+                "-mfpu=neon",
+            ],
         },
         arm64: {
             cflags: [
-                "-DHAVE_ARM64_CRC32C=0",
                 "-DWEBRTC_ARCH_ARM64",
                 "-DWEBRTC_HAS_NEON",
             ],
         },
         riscv64: {
-            cflags: ["-DHAVE_ARM64_CRC32C=0"],
         },
         x86_64: {
             cflags: [
-                "-DHAVE_ARM64_CRC32C=0",
                 "-mavx2",
                 "-mfma",
                 "-msse2",
+                "-msse3",
             ],
         },
         x86: {
             cflags: [
-                "-DHAVE_ARM64_CRC32C=0",
                 "-mavx2",
                 "-mfma",
                 "-msse2",
+                "-msse3",
             ],
         },
     },
@@ -186,10 +203,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -223,10 +236,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -903,10 +912,6 @@ cc_library_static {
         "modules/audio_processing/aec3/vector_math_avx2.cc",
     ],
     host_supported: true,
-    cflags: [
-        "-mavx2",
-        "-mfma",
-    ],
     static_libs: [
         "webrtc_audio_processing__apm_logging",
         "webrtc_containers__flat_containers_internal",
@@ -957,10 +962,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system__file_wrapper",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -1107,10 +1108,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -1178,10 +1175,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__system_wrappers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -1243,10 +1236,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -1317,10 +1306,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__metrics",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -1619,10 +1604,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -1686,10 +1667,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -1988,10 +1965,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2021,10 +1994,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__field_trial",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2334,10 +2303,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2365,10 +2330,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2398,10 +2359,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system__file_wrapper",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2430,10 +2387,6 @@ cc_library_static {
         "webrtc_units__timestamp",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2463,10 +2416,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2494,10 +2443,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2577,10 +2522,6 @@ cc_library_static {
         "webrtc_video__video_rtp_headers",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2591,10 +2532,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["api/call/transport.cc"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2633,10 +2570,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2658,10 +2591,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2894,10 +2823,6 @@ cc_library_static {
         "webrtc_rtc_base__timeutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -2932,10 +2857,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3127,10 +3048,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3246,10 +3163,6 @@ cc_library_static {
         "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3292,10 +3205,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3307,10 +3216,6 @@ cc_library_static {
     srcs: ["modules/audio_coding/codecs/g711/g711_interface.c"],
     host_supported: true,
     static_libs: ["webrtc_g711__g711_3p"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3345,10 +3250,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3360,10 +3261,6 @@ cc_library_static {
     srcs: ["modules/audio_coding/codecs/g722/g722_interface.c"],
     host_supported: true,
     static_libs: ["webrtc_g722__g722_3p"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3533,10 +3430,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_fft__fft"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3568,10 +3461,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3694,10 +3583,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3708,10 +3593,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["modules/audio_coding/codecs/pcm16b/pcm16b.c"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3830,10 +3711,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -3924,10 +3801,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__field_trial",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -4195,10 +4068,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system__file_wrapper",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -4302,10 +4171,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -4402,10 +4267,6 @@ cc_library_static {
         "modules/audio_processing/include/audio_processing_statistics.cc",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -4576,10 +4437,6 @@ cc_library_static {
         "webrtc_video__video_bitrate_allocation",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -4601,10 +4458,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -4694,10 +4547,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -5326,10 +5175,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -5666,10 +5511,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -5680,10 +5521,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["call/version.cc"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -5777,10 +5614,6 @@ cc_library_static {
         "webrtc_video__video_rtp_headers",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -5933,10 +5766,6 @@ cc_library_static {
         "common_audio/resampler/sinc_resampler_avx2.cc",
     ],
     host_supported: true,
-    cflags: [
-        "-mavx2",
-        "-mfma",
-    ],
     static_libs: [
         "webrtc_containers__flat_containers_internal",
         "webrtc_memory__aligned_malloc",
@@ -6090,10 +5919,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__system_wrappers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6116,7 +5941,6 @@ cc_library_static {
         "common_audio/resampler/sinc_resampler_neon.cc",
     ],
     host_supported: true,
-    cflags: ["-DWEBRTC_HAS_NEON"],
     static_libs: [
         "webrtc_common_audio__common_audio_neon_c",
         "webrtc_containers__flat_containers_internal",
@@ -6163,7 +5987,6 @@ cc_library_static {
         "common_audio/signal_processing/min_max_operations_neon.c",
     ],
     host_supported: true,
-    cflags: ["-DWEBRTC_HAS_NEON"],
     static_libs: [
         "webrtc_common_audio__common_audio_c",
         "webrtc_containers__flat_containers_internal",
@@ -6207,7 +6030,6 @@ cc_library_static {
         "common_audio/resampler/sinc_resampler_sse.cc",
     ],
     host_supported: true,
-    cflags: ["-msse2"],
     static_libs: [
         "webrtc_containers__flat_containers_internal",
         "webrtc_memory__aligned_malloc",
@@ -6366,10 +6188,6 @@ cc_library_static {
         "webrtc_video__video_rtp_headers",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6399,10 +6217,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6710,10 +6524,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6800,10 +6610,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6870,10 +6676,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_transport__field_trial_based_config",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6906,10 +6708,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6942,10 +6740,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_transport__field_trial_based_config",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -6976,10 +6770,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__field_trial",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7012,10 +6802,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7050,10 +6836,6 @@ cc_library_static {
         "webrtc_units__data_size",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7084,10 +6866,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_transport__field_trial_based_config",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7120,10 +6898,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_video__video_frame",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7153,10 +6927,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__field_trial",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7189,10 +6959,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_transport__field_trial_based_config",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7225,10 +6991,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_transport__field_trial_based_config",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7260,10 +7022,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7300,10 +7058,6 @@ cc_library_static {
         "webrtc_units__data_size",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7333,10 +7087,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__field_trial",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7367,10 +7117,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_transport__field_trial_based_config",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7381,10 +7127,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["modules/third_party/fft/fft.c"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7417,10 +7159,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7454,10 +7192,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7468,10 +7202,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["modules/third_party/g711/g711.c"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7504,10 +7234,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7541,10 +7267,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7558,10 +7280,6 @@ cc_library_static {
         "modules/third_party/g722/g722_encode.c",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7585,10 +7303,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7625,10 +7339,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_transport__field_trial_based_config",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -7838,10 +7548,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8007,10 +7713,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_units__data_rate",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8043,10 +7745,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8115,10 +7813,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8157,10 +7851,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8193,10 +7883,6 @@ cc_library_static {
         "webrtc_transport__network_control",
         "webrtc_units__data_size",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8271,10 +7957,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8454,10 +8136,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8494,10 +8172,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8529,10 +8203,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8569,10 +8239,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8607,10 +8273,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8647,10 +8309,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_transport__network_control",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8679,10 +8337,6 @@ cc_library_static {
         "webrtc_rtc_base__bit_buffer",
         "webrtc_rtc_base__checks",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8713,10 +8367,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8787,10 +8437,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8824,10 +8470,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -8857,10 +8499,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -9751,10 +9389,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -9908,10 +9542,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -9942,10 +9572,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__system_wrappers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -9971,10 +9597,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10004,10 +9626,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10039,10 +9657,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__system_wrappers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10069,10 +9683,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10112,10 +9722,6 @@ cc_library_static {
         "rtc_base/network/sent_packet.cc",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10206,10 +9812,6 @@ cc_library_static {
         "webrtc_rtc_base__timeutils",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10269,10 +9871,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["common_audio/third_party/ooura/fft_size_256/fft4g.cc"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10306,10 +9904,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10386,10 +9980,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10450,10 +10040,6 @@ cc_library_static {
     ],
     host_supported: true,
     cflags: ["-DWEBRTC_OPUS_VARIABLE_COMPLEXITY=0"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10529,10 +10115,6 @@ cc_library_static {
         "webrtc_task_queue__pending_task_safety_flag",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10653,10 +10235,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10678,10 +10256,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10868,10 +10442,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10901,10 +10471,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10929,10 +10495,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -10976,10 +10538,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -11019,10 +10577,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -11056,10 +10610,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -11087,10 +10637,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -11266,10 +10812,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -11858,10 +11400,6 @@ cc_library_static {
         "webrtc_synchronization__sequence_checker_internal",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -11922,10 +11460,6 @@ cc_library_static {
         "pc/media_protocol_names.cc",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -12091,10 +11625,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -12271,10 +11801,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14369,10 +13895,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14407,10 +13929,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_video__video_frame",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14441,10 +13959,6 @@ cc_library_static {
         "webrtc_system_wrappers__metrics",
         "webrtc_video__video_frame",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14517,10 +14031,6 @@ cc_library_static {
         "webrtc_system_wrappers__system_wrappers",
         "webrtc_utility__pffft_wrapper",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14553,10 +14063,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14626,10 +14132,6 @@ cc_library_static {
         "webrtc_system_wrappers__system_wrappers",
         "webrtc_utility__pffft_wrapper",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14651,10 +14153,6 @@ cc_library_static {
         "modules/audio_processing/agc2/rnn_vad/vector_math_avx2.cc",
     ],
     host_supported: true,
-    cflags: [
-        "-mavx2",
-        "-mfma",
-    ],
     static_libs: [
         "webrtc_agc2__cpu_features",
         "webrtc_containers__flat_containers_internal",
@@ -14701,10 +14199,6 @@ cc_library_static {
         "webrtc_sigslot__sigslot",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14734,10 +14228,6 @@ cc_library_static {
         "webrtc_sigslot__sigslot",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14770,10 +14260,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14795,10 +14281,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14835,10 +14317,6 @@ cc_library_static {
         "webrtc_synchronization__sequence_checker_internal",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14863,10 +14341,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__zero_memory",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14895,10 +14369,6 @@ cc_library_static {
         "rtc_base/checks.cc",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14923,10 +14393,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__zero_memory",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14952,10 +14418,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -14987,10 +14449,6 @@ cc_library_static {
         "webrtc_synchronization__sequence_checker_internal",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15013,10 +14471,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15043,10 +14497,6 @@ cc_library_static {
         "webrtc_rtc_base__net_helpers",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15076,10 +14526,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15100,10 +14546,6 @@ cc_library_static {
         "rtc_base/net_helpers.cc",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15141,10 +14583,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15174,10 +14612,6 @@ cc_library_static {
         "webrtc_synchronization__sequence_checker_internal",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15199,10 +14633,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15227,10 +14657,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__platform_thread_types",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15252,10 +14678,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15285,10 +14707,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__system_wrappers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15316,10 +14734,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15345,10 +14759,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__timeutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15465,10 +14875,6 @@ cc_library_static {
         "webrtc_transport__field_trial_based_config",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15496,10 +14902,6 @@ cc_library_static {
         "webrtc_synchronization__yield_policy",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15524,10 +14926,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15561,10 +14959,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15597,10 +14991,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15623,10 +15013,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15655,10 +15041,6 @@ cc_library_static {
         "webrtc_sigslot__sigslot",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15689,10 +15071,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15719,10 +15097,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15774,10 +15148,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15806,10 +15176,6 @@ cc_library_static {
         "webrtc_rtc_base__timeutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15836,10 +15202,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15867,10 +15229,6 @@ cc_library_static {
         "webrtc_synchronization__sequence_checker_internal",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15892,10 +15250,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15923,10 +15277,6 @@ cc_library_static {
         "webrtc_rtc_base__timeutils",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -15957,10 +15307,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16168,10 +15514,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16477,10 +15819,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16513,10 +15851,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16550,10 +15884,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_timer__timer",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16618,10 +15948,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16688,10 +16014,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16723,10 +16045,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16737,10 +16055,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["rtc_base/third_party/sigslot/sigslot.cc"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16825,10 +16139,6 @@ cc_library_static {
         "webrtc_tx__rr_send_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16867,10 +16177,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_timer__timer",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16906,10 +16212,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_timer__timer",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -16983,10 +16285,6 @@ cc_library_static {
         "webrtc_tx__retransmission_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17063,10 +16361,6 @@ cc_library_static {
         "webrtc_tx__retransmission_timeout",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17122,10 +16416,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17303,10 +16593,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17333,10 +16619,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["rtc_base/synchronization/yield.cc"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17358,10 +16640,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17386,10 +16664,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__criticalsection",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17412,10 +16686,6 @@ cc_library_static {
     host_supported: true,
     cppflags: ["-Wno-unused-private-field"],
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17445,10 +16715,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17476,10 +16742,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17517,10 +16779,6 @@ cc_library_static {
         "webrtc_system_wrappers__field_trial",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17550,10 +16808,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17581,10 +16835,6 @@ cc_library_static {
         "webrtc_synchronization__sequence_checker_internal",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17610,10 +16860,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17649,10 +16895,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17831,10 +17073,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17862,10 +17100,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17891,10 +17125,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__rtc_numerics",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17921,10 +17151,6 @@ cc_library_static {
         "webrtc_units__data_size",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -17952,10 +17178,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18024,10 +17246,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18053,10 +17271,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18082,10 +17296,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18122,10 +17332,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18191,10 +17397,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18210,10 +17412,6 @@ cc_library_static {
         "api/transport/bitrate_settings.cc",
     ],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18243,10 +17441,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_system_wrappers__field_trial",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18401,10 +17595,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18447,10 +17637,6 @@ cc_library_static {
         "webrtc_timer__timer",
         "webrtc_tx__retransmission_timeout",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18478,10 +17664,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18517,10 +17699,6 @@ cc_library_static {
         "webrtc_tx__outstanding_data",
         "webrtc_tx__retransmission_timeout",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18543,10 +17721,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18583,10 +17757,6 @@ cc_library_static {
         "webrtc_task_queue__task_queue",
         "webrtc_tx__stream_scheduler",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18623,10 +17793,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_task_queue__task_queue",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18671,10 +17837,6 @@ cc_library_static {
         "webrtc_units__frequency",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18700,10 +17862,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18730,10 +17888,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18759,10 +17913,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18789,10 +17939,6 @@ cc_library_static {
         "webrtc_rtc_base__stringutils",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18854,10 +18000,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18880,10 +18022,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -18905,10 +18043,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19126,10 +18260,6 @@ cc_library_static {
         "webrtc_units__timestamp",
         "webrtc_video__frame_decode_timing",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19196,10 +18326,6 @@ cc_library_static {
         "webrtc_video__video_rtp_headers",
         "webrtc_video_coding__encoded_frame",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19229,10 +18355,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19399,10 +18521,6 @@ cc_library_static {
         "webrtc_units__timestamp",
         "webrtc_video__video_frame",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19437,10 +18555,6 @@ cc_library_static {
         "webrtc_timing__timing_module",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19607,10 +18721,6 @@ cc_library_static {
         "webrtc_units__timestamp",
         "webrtc_video__frame_decode_timing",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19621,10 +18731,6 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: ["video/unique_timestamp_counter.cc"],
     host_supported: true,
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19848,10 +18954,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19877,10 +18979,6 @@ cc_library_static {
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__stringutils",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19907,10 +19005,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_video__video_bitrate_allocation",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -19947,10 +19041,6 @@ cc_library_static {
         "webrtc_synchronization__yield",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -20014,10 +19104,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -20060,10 +19146,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -20097,10 +19179,6 @@ cc_library_static {
         "webrtc_units__data_rate",
         "webrtc_units__time_delta",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21000,10 +20078,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21156,10 +20230,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21230,10 +20300,6 @@ cc_library_static {
         "webrtc_video__video_rtp_headers",
         "webrtc_video_coding__video_codec_interface",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21263,10 +20329,6 @@ cc_library_static {
         "webrtc_rtc_base__platform_thread_types",
         "webrtc_synchronization__yield",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21333,10 +20395,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21375,10 +20433,6 @@ cc_library_static {
         "webrtc_units__time_delta",
         "webrtc_units__timestamp",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21453,10 +20507,6 @@ cc_library_static {
         "webrtc_video__video_frame",
         "webrtc_video__video_rtp_headers",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -21524,10 +20574,6 @@ cc_library_static {
         "webrtc_video__video_rtp_headers",
         "webrtc_video_codecs__video_codecs_api",
     ],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
@@ -22008,10 +21054,6 @@ cc_library_static {
     ],
     host_supported: true,
     static_libs: ["webrtc_rtc_base__checks"],
-    arch: {
-        arm: {
-        },
-    },
 }
 
 /* From target:
diff --git a/android_tools/generate_bp.py b/android_tools/generate_bp.py
index 71894a09aa..70054ff61f 100755
--- a/android_tools/generate_bp.py
+++ b/android_tools/generate_bp.py
@@ -52,48 +52,45 @@ IGNORED_FLAGS = [
     '-fno-rtti',
     '-gsplit-dwarf', # TODO(b/266468464): breaks riscv
     '-gdwarf-aranges', # TODO(b/269343483): breaks riscv
+    '-D_DEBUG',
     ]
 DEFAULT_CFLAGS = [
-    '-Wno-everything',
-    '-Wno-all',
-    '-Wno-error',
-    '-Wno-unreachable-code-aggressive',
-    '-Wno-unreachable-code-break',
-    '-Wno-unused-parameter',
-    '-Wno-missing-field-initializers',
-    '-Wno-implicit-const-int-float-conversion',
-    '-DUSE_UDEV',
+    '-DHAVE_ARM64_CRC32C=0',
     '-DUSE_AURA=1',
     '-DUSE_GLIB=1',
     '-DUSE_NSS_CERTS=1',
+    '-DUSE_UDEV',
     '-DUSE_X11=1',
-    '-D_FILE_OFFSET_BITS=64',
-    '-D_LARGEFILE_SOURCE',
-    '-D_LARGEFILE64_SOURCE',
-    '-D_GNU_SOURCE',
-    '-DWEBRTC_ENABLE_PROTOBUF=0',
     '-DWEBRTC_ANDROID_PLATFORM_BUILD=1',
-    '-DWEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE',
-    '-DRTC_ENABLE_VP9',
-    '-DWEBRTC_HAVE_SCTP',
-    '-DWEBRTC_LIBRARY_IMPL',
-    '-DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=1',
-    '-DWEBRTC_POSIX',
-    '-DWEBRTC_LINUX',
-    '-DWEBRTC_STRICT_FIELD_TRIALS=0',
-    '-DWEBRTC_ENABLE_AVX2',
-    '-DABSL_ALLOCATOR_NOTHROW=1',
     '-DWEBRTC_APM_DEBUG_DUMP=0',
-    '-msse3',
-    ]
+    '-D_FILE_OFFSET_BITS=64',
+    '-D_GNU_SOURCE',
+    '-D_LARGEFILE64_SOURCE',
+    '-D_LARGEFILE_SOURCE',
+    '-Wno-all',
+    '-Wno-error',
+    '-Wno-everything',
+    '-Wno-implicit-const-int-float-conversion',
+    '-Wno-missing-field-initializers',
+    '-Wno-unreachable-code-aggressive',
+    '-Wno-unreachable-code-break',
+]
+
 DEFAULT_CFLAGS_BY_ARCH = {
-        'x86': ['-msse2', '-mavx2', '-mfma', '-DHAVE_ARM64_CRC32C=0'],
-        'x64': ['-msse2', '-mavx2', '-mfma', '-DHAVE_ARM64_CRC32C=0'],
-        'arm': ['-DWEBRTC_HAS_NEON', '-DWEBRTC_ARCH_ARM_V7', '-DWEBRTC_ARCH_ARM', '-mfpu=neon', '-mthumb', '-DHAVE_ARM64_CRC32C=0'],
-        'arm64': ['-DWEBRTC_HAS_NEON', '-DWEBRTC_ARCH_ARM64', '-DHAVE_ARM64_CRC32C=0'],
-        'riscv64': ['-DHAVE_ARM64_CRC32C=0'],
+        'x86': ['-mavx2', '-mfma', '-msse2', '-msse3'],
+        'x64': ['-mavx2', '-mfma', '-msse2', '-msse3'],
+        'arm': ['-mthumb'],
+        'arm64': [],
+        'riscv64': [],
         }
+
 FLAGS = ['cflags', 'cflags_c', 'cflags_cc', 'asmflags']
+FLAG_NAME_MAP = {
+    'cflags': 'cflags',
+    'asmflags': 'asflags',
+    'cflags_cc': 'cppflags',
+    'cflags_c': 'conlyflags',
+}
 
 ARCH_NAME_MAP = {n: n for n in DEFAULT_CFLAGS_BY_ARCH.keys()}
 ARCH_NAME_MAP['x64'] = 'x86_64'
@@ -131,8 +128,8 @@ def FormatNames(target):
     return target
 
 def FilterFlags(flags, to_skip = set()):
-    skipped_opts = set(IGNORED_FLAGS).union(to_skip).union(DEFAULT_CFLAGS)
-    return sorted([x for x in flags if not any([x.startswith(y) for y in skipped_opts])])
+    skipped_opts = set(IGNORED_FLAGS).union(to_skip)
+    return [x for x in flags if not any([x.startswith(y) for y in skipped_opts])]
 
 def PrintHeader():
     print('package {')
@@ -182,39 +179,56 @@ def PrintHeader():
     print('    ],')
     print('}')
 
-def GatherDefaultFlags(targets):
-    default = { f: [] for f in FLAGS}
-    arch = {a: {} for a in ARCHS}
 
-    first = True
-    for target in targets.values():
-        typ = target['type']
-        if typ != 'static_library':
-            continue
-        if first:
-            first = False
-            # Add all the flags to the default, we'll remove some later
-            for flag_type in default.keys():
-                default[flag_type] = []
-                for flag in target[flag_type]:
-                    default[flag_type].append(flag)
-                for a in arch.keys():
-                    arch[a][flag_type] = []
-                    for flag in target.get('arch', {}).get(a, {}).get(flag_type, []):
-                        arch[a][flag_type].append(flag)
-        else:
-            for flag_type in default.keys():
-                if flag_type not in target:
-                    target[flag_type] = []
-                default[flag_type] = list(set(default[flag_type]) & set(target[flag_type]))
-                for a in arch.keys():
-                    arch[a][flag_type] = list(set(arch[a][flag_type]) & set(target.get('arch', {}).get(a, {}).get(flag_type, [])))
-
-    default['arch'] = arch
-    return default
-
-def GenerateDefault(targets):
-    in_default = GatherDefaultFlags(targets)
+
+def GatherDefaultFlags(targets_by_arch):
+    # Iterate through all of the targets for each architecture collecting the flags that
+    # are the same for all targets in that architecture.  Use a list instead of a set
+    # to maintain the flag ordering, which may be significant (e.g. -Wno-shadow has to
+    # come after -Wshadow).
+    arch_default_flags = {}
+    for arch, targets in targets_by_arch.items():
+        arch_default_flags[arch] = {}
+        for target in targets.values():
+            typ = target['type']
+            if typ != 'static_library':
+                continue
+            for flag_type in FLAGS:
+                if not flag_type in arch_default_flags:
+                    arch_default_flags[arch][flag_type] = target[flag_type]
+                else:
+                    target_flags = set(target[flag_type])
+                    flags = arch_default_flags[arch][flag_type]
+                    flags[:]  = [ x for x in flags if x in target_flags ]
+        for flag_type, flags in arch_default_flags[arch].items():
+            arch_default_flags[arch][flag_type] = FilterFlags(flags)
+        # Add in the hardcoded extra default cflags
+        arch_default_flags[arch]['cflags'] += DEFAULT_CFLAGS_BY_ARCH.get(arch, [])
+
+    # Iterate through all of the architectures collecting the flags that are the same
+    # for all targets in all architectures.
+    default_flags = {}
+    for arch, flagset in arch_default_flags.items():
+        for flag_type, arch_flags in flagset.items():
+            if not flag_type in default_flags:
+                default_flags[flag_type] = arch_flags.copy()
+            else:
+                flags = default_flags[flag_type]
+                flags[:] = [ x for x in flags if x in arch_flags ]
+    # Add in the hardcoded extra default cflags
+    default_flags['cflags'] += DEFAULT_CFLAGS
+
+    # Remove the global default flags from the per-architecture default flags
+    for arch, flagset in arch_default_flags.items():
+        for flag_type in flagset.keys():
+            flags = flagset[flag_type]
+            flags[:] = [ x for x in flags if x not in default_flags[flag_type] ]
+
+    default_flags['arch'] = arch_default_flags
+    return default_flags
+
+def GenerateDefault(targets_by_arch):
+    in_default = GatherDefaultFlags(targets_by_arch)
     print('cc_defaults {')
     print('    name: "webrtc_defaults",')
     print('    local_include_dirs: [')
@@ -222,15 +236,13 @@ def GenerateDefault(targets):
     print('      "webrtc",')
     print('      "third_party/crc32c/src/include",')
     print('    ],')
-    if PRINT_ORIGINAL_FULL:
-        for typ in sorted(in_default.keys()):
-            print('    // {0}: ['.format(typ.replace('asmflags', 'asflags')
-                .replace('cflags_cc', 'cppflags')
-                .replace('cflags_c', 'conlyflags')))
-            for flag in FilterFlags(in_default[typ]):
-                print('        // "{0}",'.format(flag.replace('"', '\\"')))
-            print('    // ],')
-    print('    cflags: {0},'.format(FormatList(DEFAULT_CFLAGS)))
+    for typ in sorted(in_default.keys() - {'arch'}):
+        flags = in_default[typ]
+        if len(flags) > 0:
+            print('    {0}: ['.format(FLAG_NAME_MAP[typ]))
+            for flag in flags:
+                print('        "{0}",'.format(flag.replace('"', '\\"')))
+            print('    ],')
     print('    header_libs: [')
     print('      "libwebrtc_absl_headers",')
     print('    ],')
@@ -261,7 +273,13 @@ def GenerateDefault(targets):
     print('    arch: {')
     for a in ARCHS:
         print('        {0}: {{'.format(ARCH_NAME_MAP[a]))
-        print('            cflags: {0}'.format(FormatList(DEFAULT_CFLAGS_BY_ARCH[a])))
+        for typ in FLAGS:
+            flags = in_default['arch'].get(a, {}).get(typ, [])
+            if len(flags) > 0:
+                print('            {0}: ['.format(FLAG_NAME_MAP[typ]))
+                for flag in flags:
+                    print('                "{0}",'.format(flag.replace('"', '\\"')))
+                print('            ],')
         print('        },')
     print('    },')
     print('    visibility: [')
@@ -269,35 +287,19 @@ def GenerateDefault(targets):
     print('        "//device/google/cuttlefish/host/frontend/webrtc:__subpackages__",')
     print('    ],')
     print('}')
-    in_default['cflags'].extend(DEFAULT_CFLAGS)
-    for a in ARCHS:
-        in_default['arch'][a]['cflags'].extend(DEFAULT_CFLAGS_BY_ARCH[a])
 
     # The flags in the default entry can be safely removed from the targets
-    for target in targets.values():
-        flag_types = in_default.keys() - {'arch'}
-        for flag_type in flag_types:
-            target[flag_type] = FilterFlags(target.get(flag_type, []), in_default[flag_type])
-            if len(target[flag_type]) == 0:
-                target.pop(flag_type)
-            if 'arch' not in target:
-                continue
-            for arch_name in in_default['arch'].keys():
-                if arch_name not in target['arch']:
-                    continue
-                arch = target['arch'][arch_name]
-                if flag_type not in arch:
-                    continue
-                arch[flag_type] = FilterFlags(arch[flag_type], in_default['arch'][arch_name][flag_type])
-                if len(arch[flag_type]) == 0:
-                    arch.pop(flag_type)
-                    if len(arch.keys()) == 0:
-                        target['arch'].pop(arch_name)
-            if len(target['arch'].keys()) == 0:
-                target.pop('arch')
+    for arch, targets in targets_by_arch.items():
+        for flag_type in FLAGS:
+            default_flags = set(in_default[flag_type]) | set(in_default['arch'][arch][flag_type])
+            for target in targets.values():
+                target[flag_type] = FilterFlags(target.get(flag_type, []), default_flags)
+                if len(target[flag_type]) == 0:
+                    target.pop(flag_type)
 
     return in_default
 
+
 def TransitiveDependencies(name, dep_type, targets):
     target = targets[name]
     field = 'transitive_' + dep_type
@@ -696,11 +698,12 @@ for arch in ARCHS:
 unusedFlags = FilterFlagsInUse(flags, f"{dir}/..")
 IGNORED_FLAGS = sorted(set(IGNORED_FLAGS) | set(unusedFlags))
 
-targets = MergeAll(targets_by_arch)
-
 PrintHeader()
 
-GenerateDefault(targets)
+GenerateDefault(targets_by_arch)
+
+targets = MergeAll(targets_by_arch)
+
 print('\n\n')
 
 for name, target in sorted(targets.items()):