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

Merge "Fix typo caused by incorrect git merge." am: 9c9a069ae6 am: 3baab77119 am: e5d18cae1e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1701987

Change-Id: Icaee6dee420654185bef5bb96099a3b4b3555bf7
This commit is contained in:
Lukács T. Berki
2021-05-11 07:00:09 +00:00
committed by Automerger Merge Worker
parent 37ea290f8c e5d18cae1e
commit dea80a9701
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/bp2build.go
View File

@@ -344,12 +344,12 @@ func bp2BuildParseLinkerProps(ctx android.TopDownMutatorContext, module *Module)
if baseLinkerProps.Version_script != nil { if baseLinkerProps.Version_script != nil {
versionScript.SetValueForArch(arch.Name, versionScript.SetValueForArch(arch.Name,
android.BazelLabelForModuleSrcSingle(ctx, *baseLinkerProps.Version_script)) android.BazelLabelForModuleSrcSingle(ctx, *baseLinkerProps.Version_script))
}
sharedLibs := baseLinkerProps.Shared_libs sharedLibs := baseLinkerProps.Shared_libs
dynamicDeps.SetValueForArch(arch.Name, android.BazelLabelForModuleDeps(ctx, sharedLibs)) dynamicDeps.SetValueForArch(arch.Name, android.BazelLabelForModuleDeps(ctx, sharedLibs))
} }
} }
}
for os, p := range module.GetTargetProperties(&BaseLinkerProperties{}) { for os, p := range module.GetTargetProperties(&BaseLinkerProperties{}) {
if baseLinkerProps, ok := p.(*BaseLinkerProperties); ok { if baseLinkerProps, ok := p.(*BaseLinkerProperties); ok {