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

rust/rust.go

@@ -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() {