diff --git a/cc/clang.go b/cc/clang.go
index f4c29f010..e9dca327e 100644
--- a/cc/clang.go
+++ b/cc/clang.go
@@ -15,6 +15,8 @@ var clangUnknownCflags = sorted([]string{
 	"-fno-tree-sra",
 	"-fprefetch-loop-arrays",
 	"-funswitch-loops",
+	"-Werror=unused-but-set-parameter",
+	"-Werror=unused-but-set-variable",
 	"-Wmaybe-uninitialized",
 	"-Wno-error=clobbered",
 	"-Wno-error=maybe-uninitialized",
diff --git a/cc/makevars.go b/cc/makevars.go
index d33d7b7fd..5259f5955 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -34,6 +34,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
 	ctx.Strict("CLANG_CXX", "${clangBin}/clang++")
 	ctx.Strict("LLVM_AS", "${clangBin}/llvm-as")
 	ctx.Strict("LLVM_LINK", "${clangBin}/llvm-link")
+	ctx.StrictSorted("CLANG_CONFIG_UNKNOWN_CFLAGS", strings.Join(clangUnknownCflags, " "))
 
 	hostType := android.CurrentHostType()
 	arches := ctx.Config().HostArches[hostType]