diff options
| -rw-r--r-- | apex/apex.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 8bad6edfa..01d74ae8c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1564,7 +1564,7 @@ func apexFileForNativeLibrary(ctx android.BaseModuleContext, ccMod *cc.Module, h dirInApex = filepath.Join(dirInApex, "bionic") } - fileToCopy := ccMod.OutputFile().Path() + fileToCopy := android.OutputFileForModule(ctx, ccMod, "") androidMkModuleName := ccMod.BaseModuleName() + ccMod.Properties.SubName return newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeSharedLib, ccMod) } @@ -1575,7 +1575,7 @@ func apexFileForExecutable(ctx android.BaseModuleContext, cc *cc.Module) apexFil dirInApex = filepath.Join(dirInApex, cc.Target().NativeBridgeRelativePath) } dirInApex = filepath.Join(dirInApex, cc.RelativeInstallPath()) - fileToCopy := cc.OutputFile().Path() + fileToCopy := android.OutputFileForModule(ctx, cc, "") androidMkModuleName := cc.BaseModuleName() + cc.Properties.SubName af := newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeExecutable, cc) af.symlinks = cc.Symlinks() @@ -1588,7 +1588,7 @@ func apexFileForRustExecutable(ctx android.BaseModuleContext, rustm *rust.Module if rustm.Target().NativeBridge == android.NativeBridgeEnabled { dirInApex = filepath.Join(dirInApex, rustm.Target().NativeBridgeRelativePath) } - fileToCopy := rustm.OutputFile().Path() + fileToCopy := android.OutputFileForModule(ctx, rustm, "") androidMkModuleName := rustm.BaseModuleName() + rustm.Properties.SubName af := newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeExecutable, rustm) return af @@ -1607,7 +1607,7 @@ func apexFileForRustLibrary(ctx android.BaseModuleContext, rustm *rust.Module) a if rustm.Target().NativeBridge == android.NativeBridgeEnabled { dirInApex = filepath.Join(dirInApex, rustm.Target().NativeBridgeRelativePath) } - fileToCopy := rustm.OutputFile().Path() + fileToCopy := android.OutputFileForModule(ctx, rustm, "") androidMkModuleName := rustm.BaseModuleName() + rustm.Properties.SubName return newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeSharedLib, rustm) } |