diff options
| author | 2023-12-13 02:29:24 +0000 | |
|---|---|---|
| committer | 2023-12-13 02:29:24 +0000 | |
| commit | 0e02a14a2beaa5db61996ca241afaa93b0cdaf9c (patch) | |
| tree | ae5adb2e37420842ec8695c3393e05f532cbf2e3 /java | |
| parent | d9c2df96013856d3766fc42c27b99d32081433bf (diff) | |
| parent | f384a08950879218950e137bdb8be5b367f897b7 (diff) | |
Merge "Use --revert-annotation instead of --hide-annotation" into main am: 550a0dab0d am: f384a08950
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2870808
Change-Id: I9078057e5c26906bc7e9e8df4cdfe023957ae3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/droidstubs.go | 2 | ||||
| -rw-r--r-- | java/droidstubs_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/config/droidstubs.go b/java/config/droidstubs.go index b7aab5a98..7029fee06 100644 --- a/java/config/droidstubs.go +++ b/java/config/droidstubs.go @@ -57,7 +57,7 @@ var ( MetalavaAnnotationsWarningsFlags = strings.Join(metalavaAnnotationsWarningsFlags, " ") metalavaHideFlaggedApis = []string{ - "--hide-annotation", + "--revert-annotation", "android.annotation.FlaggedApi", } diff --git a/java/droidstubs_test.go b/java/droidstubs_test.go index b97ae29d2..17cad8958 100644 --- a/java/droidstubs_test.go +++ b/java/droidstubs_test.go @@ -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") } |