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>
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: {
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 = {
