aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-08 00:18:08 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-08 00:18:08 +0000
commita910964b91835f4d8c61f96bea19cfcc54a85047 (patch)
tree714811172a0b155915226bc6b4dd99af18c44f2f
parent0be9907ad320f4e71eaa3fa506bff9f4062cbb6e (diff)
parent8da3064bc04d5313aea6af6934bb8e0b93a1b748 (diff)
downloadwebrtc-a910964b91835f4d8c61f96bea19cfcc54a85047.tar.gz
Snap for 11066218 from 8da3064bc04d5313aea6af6934bb8e0b93a1b748 to sdk-release
Change-Id: I642924cc643a7049ed4979f7805c11ee4e6bc01e
-rw-r--r--Android.bp4
-rwxr-xr-xandroid_tools/generate_bp.py6
2 files changed, 3 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index b7a1852ac1..985714fb1f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,9 +87,7 @@ cc_defaults {
"-D_GNU_SOURCE",
"-D_LARGEFILE64_SOURCE",
"-D_LARGEFILE_SOURCE",
- "-Wno-all",
- "-Wno-error",
- "-Wno-everything",
+ "-Wno-global-constructors",
"-Wno-implicit-const-int-float-conversion",
"-Wno-missing-field-initializers",
"-Wno-unreachable-code-aggressive",
diff --git a/android_tools/generate_bp.py b/android_tools/generate_bp.py
index 047dd51eb0..e61f922307 100755
--- a/android_tools/generate_bp.py
+++ b/android_tools/generate_bp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import json
import os
@@ -31,9 +31,7 @@ DEFAULT_CFLAGS = [
'-D_GNU_SOURCE',
'-D_LARGEFILE64_SOURCE',
'-D_LARGEFILE_SOURCE',
- '-Wno-all',
- '-Wno-error',
- '-Wno-everything',
+ '-Wno-global-constructors',
'-Wno-implicit-const-int-float-conversion',
'-Wno-missing-field-initializers',
'-Wno-unreachable-code-aggressive',