openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: 299abf19c3

Change-Id: If982b553818062f476298027f0ae19b9e6699a06
This commit is contained in:
Roland Levillain 2019-06-11 07:01:03 -07:00 committed by android-build-merger
parent dac578df15 299abf19c3
commit bcb2d44966
1 changed files with 9 additions and 5 deletions
Show Stats 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()
if 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 {
@ -398,11 +402,11 @@ func (binary *binaryDecorator) link(ctx ModuleContext,
}
if Bool(binary.Properties.Symlink_preferred_arch) {
if String(binary.Properties.Stem) == "" && String(binary.Properties.Suffix) == "" {
ctx.PropertyErrorf("symlink_preferred_arch", "must also specify stem or suffix")
if String(binary.Properties.Suffix) == "" {
ctx.PropertyErrorf("symlink_preferred_arch", "must also specify suffix")
}
if ctx.TargetPrimary() {
binary.symlinks = append(binary.symlinks, ctx.baseModuleName())
binary.symlinks = append(binary.symlinks, binary.getStemWithoutSuffix(ctx))
}
}