diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-12-05 01:09:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-05 01:09:33 +0000 |
| commit | 5760c9a12c0660c8639d11d770236bea7a900b1a (patch) | |
| tree | 449fa71b4969408d1255d31a819ab1ae067204c8 | |
| parent | 932ecc1a978640060c7147597bf1cb5af6ef80aa (diff) | |
| parent | fa0e27a1f36cd349af569525641c5c5f81d44011 (diff) | |
| download | build_soong-5760c9a12c0660c8639d11d770236bea7a900b1a.tar.gz build_soong-5760c9a12c0660c8639d11d770236bea7a900b1a.tar.bz2 build_soong-5760c9a12c0660c8639d11d770236bea7a900b1a.zip | |
Merge "No need to dump modules added -Werror."
| -rw-r--r-- | cc/compiler.go | 1 | ||||
| -rw-r--r-- | cc/makevars.go | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/cc/compiler.go b/cc/compiler.go index d510aa38..40dbea42 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -488,7 +488,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps addToModuleList(ctx, modulesAddedWall, module) flags.CFlags = append([]string{"-Wall"}, flags.CFlags...) } else { - addToModuleList(ctx, modulesAddedWerror, module) flags.CFlags = append([]string{"-Wall", "-Werror"}, flags.CFlags...) } } diff --git a/cc/makevars.go b/cc/makevars.go index 2d71db69..0d2569ad 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -26,7 +26,6 @@ import ( const ( modulesAddedWall = "ModulesAddedWall" - modulesAddedWerror = "ModulesAddedWerror" modulesUsingWnoError = "ModulesUsingWnoError" ) @@ -102,7 +101,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("ANDROID_WARNING_ALLOWED_PROJECTS", makeStringOfWarningAllowedProjects()) ctx.Strict("SOONG_MODULES_ADDED_WALL", makeStringOfKeys(ctx, modulesAddedWall)) - ctx.Strict("SOONG_MODULES_ADDED_WERROR", makeStringOfKeys(ctx, modulesAddedWerror)) ctx.Strict("SOONG_MODULES_USING_WNO_ERROR", makeStringOfKeys(ctx, modulesUsingWnoError)) ctx.Strict("ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS", strings.Join(asanCflags, " ")) |