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

Commit 9d7c3fb4 authored by Anton Hansson's avatar Anton Hansson
Browse files

Don't require merge_annotations_dir for annotations_enabled 

As far as I can tell, annotations_enabled does not require use of
merge_annotations_dir (although it may have done in the past).

Bug: 157010342
Test: m
Change-Id: I6705522774203b4566f58679bbc2f0c17422c1dd
Merged-In: I6705522774203b4566f58679bbc2f0c17422c1dd
(cherry picked from commit c5e13279)
parent 3f07ab2d

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