diff options
Diffstat (limited to 'android/testing.go')
| -rw-r--r-- | android/testing.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/android/testing.go b/android/testing.go index 8dd467dce..18fd3b31c 100644 --- a/android/testing.go +++ b/android/testing.go @@ -1025,9 +1025,12 @@ func (m TestingModule) VariablesForTestsRelativeToTop() map[string]string { // otherwise returns the result of calling Paths.RelativeToTop // on the returned Paths. func (m TestingModule) OutputFiles(t *testing.T, tag string) Paths { - // TODO: add non-empty-string tag case and remove OutputFileProducer part - if tag == "" && m.module.base().outputFiles.DefaultOutputFiles != nil { - return m.module.base().outputFiles.DefaultOutputFiles.RelativeToTop() + // TODO: remove OutputFileProducer part + outputFiles := m.Module().base().outputFiles + if tag == "" && outputFiles.DefaultOutputFiles != nil { + return outputFiles.DefaultOutputFiles.RelativeToTop() + } else if taggedOutputFiles, hasTag := outputFiles.TaggedOutputFiles[tag]; hasTag { + return taggedOutputFiles } producer, ok := m.module.(OutputFileProducer) |