tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the version script for ndk_library.

Browse source 
am: 2bc91ba549

Change-Id: I5b07296ad3f458f901ee99297eefc6d5b536896c
This commit is contained in:
Dan Albert 2016-08-04 18:23:34 +00:00 committed by android-build-merger
commit a1b846602f
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cc/ndk_library.go
View file

@ -93,6 +93,8 @@ type stubCompiler struct {
baseCompiler
properties libraryProperties
linker *stubLinker
}
// OMG GO
@ -175,6 +177,7 @@ func (c *stubCompiler) compile(ctx ModuleContext, flags Flags, deps PathDeps) an
stubSrcPath := android.PathForModuleGen(ctx, stubSrcName)
versionScriptName := fileBase + ".map"
versionScriptPath := android.PathForModuleGen(ctx, versionScriptName)
c.linker.versionScriptPath = versionScriptPath
symbolFilePath := android.PathForModuleSrc(ctx, c.properties.Symbol_file)
ctx.ModuleBuild(pctx, android.ModuleBuildParams{
Rule: genStubSrc,
@ -209,6 +212,8 @@ func (c *stubCompiler) compile(ctx ModuleContext, flags Flags, deps PathDeps) an
type stubLinker struct {
libraryLinker
versionScriptPath android.ModuleGenPath
}
func (linker *stubLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
@ -221,6 +226,14 @@ func (linker *stubLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
return linker.libraryLinker.linkerFlags(ctx, flags)
}
func (linker *stubLinker) link(ctx ModuleContext, flags Flags, deps PathDeps,
objFiles android.Paths) android.Path {
linkerScriptFlag := "-Wl,--version-script," + linker.versionScriptPath.String()
flags.LdFlags = append(flags.LdFlags, linkerScriptFlag)
return linker.libraryLinker.link(ctx, flags, deps, objFiles)
}
type stubInstaller struct {
baseInstaller
@ -258,6 +271,7 @@ func newStubLibrary() *Module {
module.linker = linker
compiler := &stubCompiler{}
compiler.linker = linker
module.compiler = compiler
module.installer = &stubInstaller{baseInstaller{
dir: "lib",