commit 666e6ab5eaa612580ef5a805b1a1c72bf78a7ae7
author Krzysztof Kosiński <krzysio@google.com> Thu Feb 20 16:45:24 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 16:45:24 2025 -0800
tree 379d2dce1ec4f2fc26c35c5b4cdae3d7ca0c7808
parent 1a6cb89af1b5e5586cddd2f2dcd5e07f3a08fddc
parent 0086bf194af8d6ab3cdfbf9f321fb527f901ca0b

Merge "Do not force ARMv8-A." into main am: 0086bf194a

Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/3503752

Change-Id: I7a28f1a23f9c8b26e525e00a77fbf796cb81388d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 7a257f8..aa6a9a1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,12 +53,8 @@
         "third_party/crc32c/src/include",
     ],
     cflags: [
-        "-Wextra",
-        "-Wno-unused-parameter",
         "-Wshadow",
-        "-Wstring-conversion",
         "-Wexit-time-destructors",
-        "-Wglobal-constructors",
         "-Wno-shadow",
         "-Wctad-maybe-unsupported",
         "-Wc++11-narrowing",
@@ -92,6 +88,7 @@
         "-Wno-missing-field-initializers",
         "-Wno-unreachable-code-aggressive",
         "-Wno-unreachable-code-break",
+        "-Wno-unused-parameter",
     ],
     conlyflags: [
         "-Wstrict-prototypes",
@@ -2000,7 +1997,6 @@
             cflags: [
                 "-DHAVE_MM_PREFETCH=0",
                 "-DHAVE_SSE42=0",
-                "-march=armv8-a",
             ],
         },
         riscv64: {

android_tools/generate_bp.py

diff --git a/android_tools/generate_bp.py b/android_tools/generate_bp.py
index c6b7003..e457357 100755
--- a/android_tools/generate_bp.py
+++ b/android_tools/generate_bp.py
@@ -9,8 +9,12 @@
 # This flags are augmented with flags added to the json files but not present in .gn or .gni files
 IGNORED_FLAGS = [
     '-D_DEBUG',
+    '-Wall',  # already globally enabled
     '-Werror',
+    '-Wextra',  # already globally enabled
+    '-Wglobal-constructors',  # disabled in DEFAULT_CFLAGS below
     '-Xclang',
+    '-march=armv8-a',  # TARGET_ARCH_VARIANT may be newer
     '-target-feature',
     '+crc',
     '+crypto',
@@ -19,6 +23,7 @@
     'HAVE_ARM64_CRC32C=1'
 ]
 DEFAULT_CFLAGS = [
+    '-DABSL_ALLOCATOR_NOTHROW=1',
     '-DHAVE_ARM64_CRC32C=0',
     '-DUSE_AURA=1',
     '-DUSE_GLIB=1',
@@ -36,6 +41,7 @@
     '-Wno-missing-field-initializers',
     '-Wno-unreachable-code-aggressive',
     '-Wno-unreachable-code-break',
+    "-Wno-unused-parameter",
 ]
 
 DEFAULT_CFLAGS_BY_ARCH = {