Support unique_host_soname to add -host for shared libs

In order to distinguish our host libraries from system installed
libraries, support a flag to automatically append -host to host shared
libraries names. Previously, we were implementing this with different modules,
but with Soong, we'd really like to share the module definitions.

This properly exports the module to make, so that
LOCAL_SHARED_LIBRARIES := libcrypto still works, but the final installed
name is libcrypto-host.so.

Change-Id: I63389469fe1b38078b8bbf4c0fd92e54ef90ae1a
This commit is contained in:
Dan Willemsen
2016-07-21 16:42:14 -07:00
parent 72bd7dba4a
commit 648c8aed4c
2 changed files with 18 additions and 2 deletions

View File

@@ -402,6 +402,9 @@ type LibraryLinkerProperties struct {
// local file name to pass to the linker as -force_symbols_weak_list
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"`
}
@@ -1605,11 +1608,23 @@ func (library *libraryLinker) props() []interface{} {
&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 {
flags = library.baseLinker.flags(ctx, flags)
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
sharedFlag := "-Wl,-shared"
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)
ret := outputFile