Only return the source files of a Rust module with a SourceProvider if the internal compiler has been disabled

Test: mmma system/tools/aidl with assertOutput FIXMEs re-enabled
Change-Id: I84598ae2d1181656b7d68088f86ab016563e5d80
This commit is contained in:
Andrei Homescu
2020-08-06 15:27:45 -07:00
parent 3d02e1f3c5
commit 5db69cc896

View File

@@ -92,7 +92,7 @@ type Module struct {
func (mod *Module) OutputFiles(tag string) (android.Paths, error) {
switch tag {
case "":
if mod.sourceProvider != nil {
if mod.sourceProvider != nil && (mod.compiler == nil || mod.compiler.Disabled()) {
return mod.sourceProvider.Srcs(), nil
} else {
if mod.outputFile.Valid() {