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

Commit 823b9182 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Don't require merge_annotations_dir for annotations_enabled" am: 5ac7fad7 

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

Change-Id: I8a3509a4f55d30f6d117ed20c5b7b1927e9660d6
parents 15f6d767 5ac7fad7

java/droiddoc.go

+2 −5
Original line number Diff line number Diff line
@@ -1334,12 +1334,9 @@ func (d *Droidstubs) annotationsFlags(ctx android.ModuleContext, cmd *android.Ru 
		d.annotationsZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"_annotations.zip")

		cmd.FlagWithOutput("--extract-annotations ", d.annotationsZip)



		if len(d.properties.Merge_annotations_dirs) == 0 {

			ctx.PropertyErrorf("merge_annotations_dirs",

				"has to be non-empty if annotations was enabled!")

		}



		if len(d.properties.Merge_annotations_dirs) != 0 {

			d.mergeAnnoDirFlags(ctx, cmd)

		}



		// TODO(tnorbye): find owners to fix these warnings when annotation was enabled.

		cmd.FlagWithArg("--hide ", "HiddenTypedefConstant").