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

Commit 1200e780 authored by Ivan Lozano's avatar Ivan Lozano Committed by Automerger Merge Worker
Browse files

Merge "Only return the source files of a Rust module with a SourceProvider if... 

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

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1393632

Change-Id: I06243ab4506fd46e760da0b45d97bdda79698196
parents a2e8000d 4c698f3f

rust/rust.go

+1 −1
Original line number Diff line number Diff line
@@ -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() {