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

Merge changes Idea4f04c,I3b85ef66 am: 6dd78bdda0

Browse Source 
am: ff2da83225

Change-Id: I74f98c23c39a9dfda2ecbf3d5c51e8c2f4ca9e42
This commit is contained in:
Mitch Phillips
2019-11-14 20:43:21 -08:00
committed by android-build-merger
parent 00b77a3202 ff2da83225
commit 80a34b5936
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cc/fuzz.go
View File

@@ -103,8 +103,11 @@ func (fuzz *fuzzBinary) linkerDeps(ctx DepsContext, deps Deps) Deps {
func (fuzz *fuzzBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags { func (fuzz *fuzzBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags {
flags = fuzz.binaryDecorator.linkerFlags(ctx, flags) flags = fuzz.binaryDecorator.linkerFlags(ctx, flags)
// RunPaths on devices isn't instantiated by the base linker. // RunPaths on devices isn't instantiated by the base linker. `../lib` for
// installed fuzz targets (both host and device), and `./lib` for fuzz
// target packages.
flags.Local.LdFlags = append(flags.Local.LdFlags, `-Wl,-rpath,\$$ORIGIN/../lib`) flags.Local.LdFlags = append(flags.Local.LdFlags, `-Wl,-rpath,\$$ORIGIN/../lib`)
flags.Local.LdFlags = append(flags.Local.LdFlags, `-Wl,-rpath,\$$ORIGIN/lib`)
return flags return flags
} }
@@ -123,19 +126,23 @@ func collectAllSharedDependencies(
// Enumerate the first level of dependencies, as we discard all non-library // Enumerate the first level of dependencies, as we discard all non-library
// modules in the BFS loop below. // modules in the BFS loop below.
ctx.VisitDirectDeps(module, func(dep android.Module) { ctx.VisitDirectDeps(module, func(dep android.Module) {
fringe = append(fringe, dep) if isValidSharedDependency(dep, sharedDeps) {
fringe = append(fringe, dep)
}
}) })
for i := 0; i < len(fringe); i++ { for i := 0; i < len(fringe); i++ {
module := fringe[i] module := fringe[i]
if !isValidSharedDependency(module, sharedDeps) { if _, exists := sharedDeps[module.Name()]; exists {
continue continue
} }
ccModule := module.(*Module) ccModule := module.(*Module)
sharedDeps[ccModule.Name()] = ccModule.UnstrippedOutputFile() sharedDeps[ccModule.Name()] = ccModule.UnstrippedOutputFile()
ctx.VisitDirectDeps(module, func(dep android.Module) { ctx.VisitDirectDeps(module, func(dep android.Module) {
fringe = append(fringe, dep) if isValidSharedDependency(dep, sharedDeps) {
fringe = append(fringe, dep)
}
}) })
} }
} }
@@ -155,10 +162,21 @@ func isValidSharedDependency(
if linkable, ok := dependency.(LinkableInterface); !ok || // Discard non-linkables. if linkable, ok := dependency.(LinkableInterface); !ok || // Discard non-linkables.
!linkable.CcLibraryInterface() || !linkable.Shared() || // Discard static libs. !linkable.CcLibraryInterface() || !linkable.Shared() || // Discard static libs.
linkable.UseVndk() || // Discard vendor linked libraries. linkable.UseVndk() || // Discard vendor linked libraries.
!linkable.CcLibrary() || linkable.BuildStubs() { // Discard stubs libs (only CCLibrary variants). // Discard stubs libs (only CCLibrary variants). Prebuilt libraries should not
// be excluded on the basis of they're not CCLibrary()'s.
(linkable.CcLibrary() && linkable.BuildStubs()) {
return false return false
} }
// We discarded module stubs libraries above, but the LLNDK prebuilts stubs
// libraries must be handled differently - by looking for the stubDecorator.
// Discard LLNDK prebuilts stubs as well.
if ccLibrary, isCcLibrary := dependency.(*Module); isCcLibrary {
if _, isLLndkStubLibrary := ccLibrary.linker.(*stubDecorator); isLLndkStubLibrary {
return false
}
}
// If this library has already been traversed, we don't need to do any more work. // If this library has already been traversed, we don't need to do any more work.
if _, exists := sharedDeps[dependency.Name()]; exists { if _, exists := sharedDeps[dependency.Name()]; exists {
return false return false