diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-03 01:06:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-03 01:06:47 +0000 |
| commit | 9e75a4dc55b762e0620083f82ce2664e08701931 (patch) | |
| tree | 714811172a0b155915226bc6b4dd99af18c44f2f | |
| parent | a5af590014c899b5b331904f70acc39b605b587c (diff) | |
| parent | 97d1d61544539b7df5aa4f4a50ddef5f9c337056 (diff) | |
| download | webrtc-9e75a4dc55b762e0620083f82ce2664e08701931.tar.gz | |
Merge "Remove -Wno-everything from WebRTC build file." into main am: 8da3064bc0 am: a6c66510ea am: 97d1d61544
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2808695
Change-Id: I43a9b313e97776042d9160ed36d479496d6fb072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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', |