Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 550a0dab authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents fa6995f7 7ac943f7

java/config/droidstubs.go

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ var ( 
	MetalavaAnnotationsWarningsFlags = strings.Join(metalavaAnnotationsWarningsFlags, " ")



	metalavaHideFlaggedApis = []string{

		"--hide-annotation",

		"--revert-annotation",

		"android.annotation.FlaggedApi",

	}

java/droidstubs_test.go

+1 −1
Original line number Diff line number Diff line
@@ -393,5 +393,5 @@ func TestDroidstubsHideFlaggedApi(t *testing.T) { 
	m := result.ModuleForTests("foo", "android_common")

	manifest := m.Output("metalava.sbox.textproto")

	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")

}