From 4985e518f8dd55a74468f39d3b79af2c5f494ba5 Mon Sep 17 00:00:00 2001 From: Andrei Onea Date: Thu, 29 Apr 2021 16:29:34 +0100 Subject: [PATCH] Exclude RequiresApi from generated stubs This annotation is required for linting, but is not useful in stubs. Bug: 185579441 Test: cherry-pick http://ag/14098354 and regenerate stubs Change-Id: I7e4da99a8843b9c709f3b59f125f43cbd66bda4e --- java/droidstubs.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/droidstubs.go b/java/droidstubs.go index 2676f3d6c..90d989604 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -283,6 +283,8 @@ func (d *Droidstubs) annotationsFlags(ctx android.ModuleContext, cmd *android.Ru if Bool(d.properties.Annotations_enabled) { cmd.Flag("--include-annotations") + cmd.FlagWithArg("--exclude-annotation ", "androidx.annotation.RequiresApi") + validatingNullability := strings.Contains(String(d.Javadoc.properties.Args), "--validate-nullability-from-merged-stubs") || String(d.properties.Validate_nullability_from_list) != ""