summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-04-12 23:49:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-12 23:49:02 +0000
commit697c8f91a3467e746b82469b6859569f7e372d79 (patch)
treedbf7db9341fb67ee4d29d918f82864fe1965628c
parent41333ae3ee02b6ee3466dd5699376c38b19a2aa2 (diff)
parent9a7898d8008c097d7a07d4bc80fc7dec6d65bae4 (diff)
Merge "Allow override of -Wno-error=format" into main am: 9a7898d800
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037518 Change-Id: I3d83aaf6e98d04bd193ac4d3dedad7945ea7d82b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--cc/config/global.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/config/global.go b/cc/config/global.go
index 08fcb91fa..16b5e0938 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -144,6 +144,9 @@ var (
// Make paths in deps files relative.
"-no-canonical-prefixes",
+
+ // http://b/315250603 temporarily disabled
+ "-Wno-error=format",
}
commonGlobalConlyflags = []string{}
@@ -254,8 +257,6 @@ var (
"-Werror=fortify-source",
// http://b/315246135 temporarily disabled
"-Wno-unused-variable",
- // http://b/315250603 temporarily disabled
- "-Wno-error=format",
// Disabled because it produces many false positives. http://b/323050926
"-Wno-missing-field-initializers",
// http://b/323050889