diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-22 22:05:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-22 22:05:51 +0000 |
| commit | 58484c1de2ecdb55290880f5d3b860e767d0d9fa (patch) | |
| tree | 714811172a0b155915226bc6b4dd99af18c44f2f | |
| parent | 6b947b8653c74dba816c768280cb842b7d8c1127 (diff) | |
| parent | f44d78b82de2d00bdd3117d1d2b962948ef558f3 (diff) | |
| download | webrtc-58484c1de2ecdb55290880f5d3b860e767d0d9fa.tar.gz | |
Merge "Snap for 11135399 from 8da3064bc04d5313aea6af6934bb8e0b93a1b748 to simpleperf-release" into simpleperf-release
| -rw-r--r-- | Android.bp | 4 | ||||
| -rwxr-xr-x | android_tools/generate_bp.py | 6 |
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', |