Merge "Don't require merge_annotations_dir for annotations_enabled" into rvc-dev (601fdd97) · Commits · e / os / android_build_soong

java/droiddoc.go

+2 −5

Original line number	Diff line number	Diff line
		@@ -1308,12 +1308,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").