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:
@@ -92,7 +92,7 @@ type Module struct {
|
|||||||
func (mod *Module) OutputFiles(tag string) (android.Paths, error) {
|
func (mod *Module) OutputFiles(tag string) (android.Paths, error) {
|
||||||
switch tag {
|
switch tag {
|
||||||
case "":
|
case "":
|
||||||
if mod.sourceProvider != nil {
|
if mod.sourceProvider != nil && (mod.compiler == nil || mod.compiler.Disabled()) {
|
||||||
return mod.sourceProvider.Srcs(), nil
|
return mod.sourceProvider.Srcs(), nil
|
||||||
} else {
|
} else {
|
||||||
if mod.outputFile.Valid() {
|
if mod.outputFile.Valid() {
|
||||||
|
Reference in New Issue
Block a user