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

Commit d6b12383 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Droiddoc can accept logtags as input sources"

parents 32cd62cb d734c790
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ func (j *Javadoc) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Op
	return strings.Join(flags, " "), deps
}

// TODO: remove the duplication between this and the one in gen.go
func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths,
	flags droiddocBuilderFlags) android.Paths {

@@ -484,6 +485,9 @@ func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths,
		case ".aidl":
			javaFile := genAidl(ctx, srcFile, flags.aidlFlags, flags.aidlDeps)
			outSrcFiles = append(outSrcFiles, javaFile)
		case ".logtags":
			javaFile := genLogtags(ctx, srcFile)
			outSrcFiles = append(outSrcFiles, javaFile)
		default:
			outSrcFiles = append(outSrcFiles, srcFile)
		}