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

Merge "Use --revert-annotation instead of --hide-annotation" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-12-13 01:24:27 +00:00
committed by Gerrit Code Review
parent fa6995f75e 7ac943f7e1
commit 550a0dab0d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/config/droidstubs.go
View File

@@ -57,7 +57,7 @@ var (
MetalavaAnnotationsWarningsFlags = strings.Join(metalavaAnnotationsWarningsFlags, " ") MetalavaAnnotationsWarningsFlags = strings.Join(metalavaAnnotationsWarningsFlags, " ")
metalavaHideFlaggedApis = []string{ metalavaHideFlaggedApis = []string{
"--hide-annotation", "--revert-annotation",
"android.annotation.FlaggedApi", "android.annotation.FlaggedApi",
} }

2
java/droidstubs_test.go
View File

@@ -393,5 +393,5 @@ func TestDroidstubsHideFlaggedApi(t *testing.T) {
m := result.ModuleForTests("foo", "android_common") m := result.ModuleForTests("foo", "android_common")
manifest := m.Output("metalava.sbox.textproto") manifest := m.Output("metalava.sbox.textproto")
cmdline := String(android.RuleBuilderSboxProtoForTests(t, result.TestContext, manifest).Commands[0].Command) cmdline := String(android.RuleBuilderSboxProtoForTests(t, result.TestContext, manifest).Commands[0].Command)
android.AssertStringDoesContain(t, "flagged api hide command not included", cmdline, "--hide-annotation android.annotation.FlaggedApi") android.AssertStringDoesContain(t, "flagged api hide command not included", cmdline, "--revert-annotation android.annotation.FlaggedApi")
} }