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

Merge \\"Support unique_host_soname to add -host for shared libs\\" am: bdf3657991

Browse Source 
am: 5fceeba074

Change-Id: I8d383dd3e657609911556db76cd20a1642ce136f
This commit is contained in:
Dan Willemsen
2016-07-22 19:31:19 +00:00
committed by android-build-merger
parent 4b28b3a350 5fceeba074
commit 96205575fb
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/androidmk.go
View File

@@ -99,6 +99,7 @@ func (library *libraryLinker) AndroidMk(ctx AndroidMkContext, ret *android.Andro
} }
fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext()) fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext())
fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)")
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=") fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")

19
cc/cc.go
View File

@@ -402,6 +402,9 @@ type LibraryLinkerProperties struct {
// local file name to pass to the linker as -force_symbols_weak_list // local file name to pass to the linker as -force_symbols_weak_list
Force_symbols_weak_list *string `android:"arch_variant"` Force_symbols_weak_list *string `android:"arch_variant"`
// rename host libraries to prevent overlap with system installed libraries
Unique_host_soname *bool
VariantName string `blueprint:"mutated"` VariantName string `blueprint:"mutated"`
} }
@@ -1605,11 +1608,23 @@ func (library *libraryLinker) props() []interface{} {
&library.stripper.StripProperties) &library.stripper.StripProperties)
} }
func (library *libraryLinker) getLibName(ctx ModuleContext) string {
name := ctx.ModuleName()
if Bool(library.Properties.Unique_host_soname) {
if !strings.HasSuffix(name, "-host") {
name = name + "-host"
}
}
return name + library.Properties.VariantName
}
func (library *libraryLinker) flags(ctx ModuleContext, flags Flags) Flags { func (library *libraryLinker) flags(ctx ModuleContext, flags Flags) Flags {
flags = library.baseLinker.flags(ctx, flags) flags = library.baseLinker.flags(ctx, flags)
if !library.static() { if !library.static() {
libName := ctx.ModuleName() + library.Properties.VariantName libName := library.getLibName(ctx)
// GCC for Android assumes that -shared means -Bsymbolic, use -Wl,-shared instead // GCC for Android assumes that -shared means -Bsymbolic, use -Wl,-shared instead
sharedFlag := "-Wl,-shared" sharedFlag := "-Wl,-shared"
if flags.Clang || ctx.Host() { if flags.Clang || ctx.Host() {
@@ -1729,7 +1744,7 @@ func (library *libraryLinker) linkShared(ctx ModuleContext,
} }
} }
fileName := ctx.ModuleName() + library.Properties.VariantName + flags.Toolchain.ShlibSuffix() fileName := library.getLibName(ctx) + flags.Toolchain.ShlibSuffix()
outputFile := android.PathForModuleOut(ctx, fileName) outputFile := android.PathForModuleOut(ctx, fileName)
ret := outputFile ret := outputFile