openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Change-Id: I06243ab4506fd46e760da0b45d97bdda79698196
This commit is contained in:
Ivan Lozano 2020-08-12 13:28:53 +00:00 committed by Automerger Merge Worker
parent a2e8000dce 4c698f3ff2
commit 1200e780fd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/rust.go
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() {