From 2eb349a79ba93d991a35a5df83555b5eae6010a0 Mon Sep 17 00:00:00 2001 From: Yuyang Huang Date: Wed, 15 Mar 2023 02:35:55 +0000 Subject: [PATCH] Revert "Promote NewApi to an error again" This reverts commit c398be808e6da8b76b7e8efb92f49ba555fd6117. Reason for revert: Broken the build b/273624365 Change-Id: I87bb4ca7c561cfbc6643501f60b4c00a53201908 --- java/lint.go | 7 ++++++- java/lint_test.go | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/java/lint.go b/java/lint.go index 8a8d9d147..58b43dfdb 100644 --- a/java/lint.go +++ b/java/lint.go @@ -314,7 +314,12 @@ func (l *linter) writeLintProjectXML(ctx android.ModuleContext, rule *android.Ru cmd.FlagWithInput("@", android.PathForSource(ctx, "build/soong/java/lint_defaults.txt")) - cmd.FlagForEachArg("--error_check ", l.extraMainlineLintErrors) + if l.compileSdkKind == android.SdkPublic { + cmd.FlagForEachArg("--error_check ", l.extraMainlineLintErrors) + } else { + // TODO(b/268261262): Remove this branch. We're demoting NewApi to a warning due to pre-existing issues that need to be fixed. + cmd.FlagForEachArg("--warning_check ", l.extraMainlineLintErrors) + } cmd.FlagForEachArg("--disable_check ", l.properties.Lint.Disabled_checks) cmd.FlagForEachArg("--warning_check ", l.properties.Lint.Warning_checks) cmd.FlagForEachArg("--error_check ", l.properties.Lint.Error_checks) diff --git a/java/lint_test.go b/java/lint_test.go index 5f6418d99..ec901aa70 100644 --- a/java/lint_test.go +++ b/java/lint_test.go @@ -113,7 +113,8 @@ func TestJavaLintUsesCorrectBpConfig(t *testing.T) { t.Error("did not use the correct file for baseline") } - if !strings.Contains(*sboxProto.Commands[0].Command, "--error_check NewApi") { + if !strings.Contains(*sboxProto.Commands[0].Command, "--warning_check NewApi") { + // TODO(b/268261262): Change this to check for --error_check t.Error("should check NewApi warnings") }