StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use Stem where output file name is expected in APEX" am: 0e666433cd am: 611703096e

Browse Source 
Change-Id: I94d8f5541deea86310ad3b249b670c61623f3b96
This commit is contained in:
Jiyong Park
2020-06-01 01:02:03 +00:00
committed by Automerger Merge Worker
parent 7c26c8c95c 611703096e
commit 7a12fd11ee
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/builder.go
View File

@@ -190,7 +190,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs,
var jniLibs []string
for _, fi := range a.filesInfo {
if fi.isJniLib {
jniLibs = append(jniLibs, fi.builtFile.Base())
jniLibs = append(jniLibs, fi.Stem())
}
}
if len(jniLibs) > 0 {
@@ -417,7 +417,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 _, d := range f.dataPaths {
@@ -667,7 +667,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)
}