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

Commit 3f27bcdf authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Droiddoc can accept logtags as input sources" into stage-aosp-master am: c42742c9 

am: 4bd02abd

Change-Id: I3a74c4b2b37c27167d568d5ab356fe37994aee18
parents 95de690a 4bd02abd

java/droiddoc.go

+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)

		}