diff options
Diffstat (limited to 'rust/androidmk.go')
| -rw-r--r-- | rust/androidmk.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/rust/androidmk.go b/rust/androidmk.go index 69d0df562..aea899baa 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -86,8 +86,11 @@ func (mod *Module) AndroidMk() android.AndroidMkData { func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { ctx.subAndroidMk(ret, binary.baseCompiler) + if binary.distFile.Valid() { + ret.DistFiles = android.MakeDefaultDistFiles(binary.distFile.Path()) + } + ret.Class = "EXECUTABLES" - ret.DistFile = binary.distFile ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", binary.unstrippedOutputFile.String()) if binary.coverageOutputZipFile.Valid() { @@ -127,7 +130,10 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An ret.Class = "SHARED_LIBRARIES" } - ret.DistFile = library.distFile + if library.distFile.Valid() { + ret.DistFiles = android.MakeDefaultDistFiles(library.distFile.Path()) + } + ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { if !library.rlib() { fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", library.unstrippedOutputFile.String()) @@ -143,7 +149,9 @@ func (procMacro *procMacroDecorator) AndroidMk(ctx AndroidMkContext, ret *androi ctx.subAndroidMk(ret, procMacro.baseCompiler) ret.Class = "PROC_MACRO_LIBRARIES" - ret.DistFile = procMacro.distFile + if procMacro.distFile.Valid() { + ret.DistFiles = android.MakeDefaultDistFiles(procMacro.distFile.Path()) + } } |