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

Commit f384a089 authored Dec 13, 2023 by Treehugger Robot Committed by Automerger Merge Worker Dec 13, 2023

Merge "Use --revert-annotation instead of --hide-annotation" into main am: 550a0dab

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2870808

Change-Id: I8b23da88de4671f30e29440e78f2d7a26fcec348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1fbc110b 550a0dab

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