diff options
| author | 2020-05-29 21:29:20 +0900 | |
|---|---|---|
| committer | 2020-05-30 21:15:24 +0900 | |
| commit | cbe50c7073feb8b295fbcf44dce3cb1c723f3008 (patch) | |
| tree | 4f87ba27e7c4477f7d0dc222c24319c0ab125d85 /apex/builder.go | |
| parent | ed50ca8dd8806e957a42751ebac83ebe57805ab8 (diff) | |
Use Stem where output file name is expected in APEX
Bug: 157638999
Test: m
Merged-In: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
(cherry picked from commit f1493cc0f24fcc7736623faf171ba404fb06fef8)
Change-Id: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go index cebd86aec..ee097e49f 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -395,7 +395,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { var readOnlyPaths = []string{"apex_manifest.json", "apex_manifest.pb"} var executablePaths []string // this also includes dirs for _, f := range a.filesInfo { - pathInApex := filepath.Join(f.installDir, f.builtFile.Base()) + pathInApex := f.Path() if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") { executablePaths = append(executablePaths, pathInApex) for _, s := range f.symlinks { @@ -634,7 +634,7 @@ func (a *apexBundle) buildFilesInfo(ctx android.ModuleContext) { apexBundleName := a.Name() for _, fi := range a.filesInfo { dir := filepath.Join("apex", apexBundleName, fi.installDir) - target := ctx.InstallFile(android.PathForModuleInstall(ctx, dir), fi.builtFile.Base(), fi.builtFile) + target := ctx.InstallFile(android.PathForModuleInstall(ctx, dir), fi.Stem(), fi.builtFile) for _, sym := range fi.symlinks { ctx.InstallSymlink(android.PathForModuleInstall(ctx, dir), sym, target) } |