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

Merge "Have symlink_preferred_arch: true honor the stem property." am: d7607c1c99 am: 299abf19c3

Browse Source 
am: bcb2d44966

Change-Id: I61724246cce68fa1a2b19401651c200c0094b33e
This commit is contained in:
Roland Levillain
2019-06-11 07:06:04 -07:00
committed by android-build-merger
parent caca2b8179 bcb2d44966
commit 7034d84e33
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cc/binary.go
View File

@@ -106,13 +106,17 @@ func (binary *binaryDecorator) linkerProps() []interface{} {
} }
func (binary *binaryDecorator) getStem(ctx BaseModuleContext) string { func (binary *binaryDecorator) getStemWithoutSuffix(ctx BaseModuleContext) string {
stem := ctx.baseModuleName() stem := ctx.baseModuleName()
if String(binary.Properties.Stem) != "" { if String(binary.Properties.Stem) != "" {
stem = String(binary.Properties.Stem) stem = String(binary.Properties.Stem)
} }
return stem + String(binary.Properties.Suffix) return stem
}
func (binary *binaryDecorator) getStem(ctx BaseModuleContext) string {
return binary.getStemWithoutSuffix(ctx) + String(binary.Properties.Suffix)
} }
func (binary *binaryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps { func (binary *binaryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
@@ -398,11 +402,11 @@ func (binary *binaryDecorator) link(ctx ModuleContext,
} }
if Bool(binary.Properties.Symlink_preferred_arch) { if Bool(binary.Properties.Symlink_preferred_arch) {
if String(binary.Properties.Stem) == "" && String(binary.Properties.Suffix) == "" { if String(binary.Properties.Suffix) == "" {
ctx.PropertyErrorf("symlink_preferred_arch", "must also specify stem or suffix") ctx.PropertyErrorf("symlink_preferred_arch", "must also specify suffix")
} }
if ctx.TargetPrimary() { if ctx.TargetPrimary() {
binary.symlinks = append(binary.symlinks, ctx.baseModuleName()) binary.symlinks = append(binary.symlinks, binary.getStemWithoutSuffix(ctx))
} }
} }