StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Print the modules that had strict_updatability_linting set"

Browse Source 
This reverts commit ada543ed86.

Reason for revert: b/323773738

Change-Id: Iaddd35b275392c8d0eb7ce1cc65523467462d7b3
This commit is contained in:
Cole Faust
2024-02-05 19:37:05 +00:00
committed by Android (Google) Code Review
parent ada543ed86
commit 75dd41b576
5 changed files with 21 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
java/lint_test.go
View File

@@ -202,71 +202,6 @@ func TestJavaLintStrictUpdatabilityLinting(t *testing.T) {
}
}
func TestJavaLintStrictUpdatabilityLintingMultipleParents(t *testing.T) {
bp := `
java_library {
name: "a",
srcs: ["a.java"],
static_libs: ["b"],
min_sdk_version: "29",
sdk_version: "current",
lint: {
strict_updatability_linting: true,
baseline_filename: "lint-baseline.xml",
},
}
java_library {
name: "b",
srcs: ["b.java"],
static_libs: ["c"],
min_sdk_version: "29",
sdk_version: "current",
lint: {
strict_updatability_linting: true,
},
}
java_library {
name: "d",
srcs: ["d.java"],
static_libs: ["c"],
min_sdk_version: "29",
sdk_version: "current",
lint: {
strict_updatability_linting: true,
},
}
java_library {
name: "c",
srcs: ["c.java"],
min_sdk_version: "29",
sdk_version: "current",
lint: {
baseline_filename: "lint-baseline.xml",
}
}
`
fs := android.MockFS{
"lint-baseline.xml": nil,
}
result := android.GroupFixturePreparers(PrepareForTestWithJavaDefaultModules, fs.AddToFixture()).
RunTestWithBp(t, bp)
c := result.ModuleForTests("c", "android_common")
sboxProto := android.RuleBuilderSboxProtoForTests(t, result.TestContext, c.Output("lint.sbox.textproto"))
if !strings.Contains(*sboxProto.Commands[0].Command,
"--baseline lint-baseline.xml --disallowed_issues NewApi") {
t.Error("did not restrict baselining NewApi")
}
if !strings.Contains(*sboxProto.Commands[0].Command,
"--strict_updatability_parents a,b,d") {
t.Errorf("Did not find correct strict_updatability_parents in command %q", *sboxProto.Commands[0].Command)
}
}
func TestJavaLintDatabaseSelectionFull(t *testing.T) {
testCases := []struct {
sdk_version string