Merge "adds new warnings to Android build (1/2)" am: 490b9d7931 am: 3cab1ce6f5 am: d19b58ada9

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1497076

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6159e650973c49c6b768a109e32ac6f2199fe967
diff --git a/cc/config/global.go b/cc/config/global.go
index c34f936..c62f784 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -53,6 +53,7 @@
 		"-Werror=date-time",
 		"-Werror=pragma-pack",
 		"-Werror=pragma-pack-suspicious-include",
+		"-Werror=string-plus-int",
 		"-Werror=unreachable-code-loop-increment",
 	}
 
@@ -116,8 +117,13 @@
 	}
 
 	noOverrideGlobalCflags = []string{
+		"-Werror=bool-operation",
+		"-Werror=implicit-int-float-conversion",
+		"-Werror=int-in-bool-context",
 		"-Werror=int-to-pointer-cast",
 		"-Werror=pointer-to-int-cast",
+		"-Werror=string-compare",
+		"-Werror=xor-used-as-pow",
 		// http://b/161386391 for -Wno-void-pointer-to-enum-cast
 		"-Wno-void-pointer-to-enum-cast",
 		// http://b/161386391 for -Wno-void-pointer-to-int-cast