diff options
Diffstat (limited to 'rust/androidmk.go')
| -rw-r--r-- | rust/androidmk.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rust/androidmk.go b/rust/androidmk.go index babbf9123..580601734 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -55,7 +55,6 @@ func (mod *Module) AndroidMk() android.AndroidMkData { ret := android.AndroidMkData{ OutputFile: mod.outputFile, Include: "$(BUILD_SYSTEM)/soong_rust_prebuilt.mk", - SubName: mod.subName, Extra: []android.AndroidMkExtraFunc{ func(w io.Writer, outputFile android.Path) { if len(mod.Properties.AndroidMkRlibs) > 0 { @@ -76,9 +75,11 @@ func (mod *Module) AndroidMk() android.AndroidMkData { }, }, } - if mod.compiler != nil { + + if mod.compiler != nil && !mod.compiler.Disabled() { mod.subAndroidMk(&ret, mod.compiler) } else if mod.sourceProvider != nil { + // If the compiler is disabled, this is a SourceProvider. mod.subAndroidMk(&ret, mod.sourceProvider) } ret.SubName += mod.Properties.SubName @@ -162,6 +163,7 @@ func (sourceProvider *baseSourceProvider) AndroidMk(ctx AndroidMkContext, ret *a outFile := sourceProvider.outputFile ret.Class = "ETC" ret.OutputFile = android.OptionalPathForPath(outFile) + ret.SubName += sourceProvider.subName ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { _, file := filepath.Split(outFile.String()) stem, suffix, _ := android.SplitFileExt(file) |