Stop filtering html files from droidstubs input
Metalava now expects html files to be specified explicitly. This filtering was originally added because jdiff could not cope with html inputs, but jdiff support has been removed in r.android.com/1455335. Bug: 153703940 Test: m checkapi Change-Id: I34164b633bab2892e3a1c0fd0257fcf98d537655
This commit is contained in:
@@ -425,23 +425,6 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
|
||||
}
|
||||
srcFiles = filterByPackage(srcFiles, j.properties.Filter_packages)
|
||||
|
||||
// While metalava needs package html files, it does not need them to be explicit on the command
|
||||
// line. javadoc complains if it receives html files on the command line. The filter
|
||||
// below excludes html files from the rsp file metalava. Note that the html
|
||||
// files are still included as implicit inputs for successful remote execution and correct
|
||||
// incremental builds.
|
||||
filterHtml := func(srcs []android.Path) []android.Path {
|
||||
filtered := []android.Path{}
|
||||
for _, src := range srcs {
|
||||
if src.Ext() == ".html" {
|
||||
continue
|
||||
}
|
||||
filtered = append(filtered, src)
|
||||
}
|
||||
return filtered
|
||||
}
|
||||
srcFiles = filterHtml(srcFiles)
|
||||
|
||||
aidlFlags := j.collectAidlFlags(ctx, deps)
|
||||
srcFiles = j.genSources(ctx, srcFiles, aidlFlags)
|
||||
|
||||
|
Reference in New Issue
Block a user