Include static lib information for the snapshot modules
snapshot modules require the list of static libs to find the NOTICE files for the snapshot modules. snapshot binaries must include static_executable property to check if non static binaries have libc as a static lib. Bug: 190690041 Test: Check NOTICE for libaudiopreprocessing.so built from snapshots. Change-Id: I53f7549a158ab27ada87833a3f4d58620aa7c3cf
This commit is contained in:
10
cc/cc.go
10
cc/cc.go
@@ -337,6 +337,7 @@ type BaseProperties struct {
|
||||
|
||||
// Used by vendor snapshot to record dependencies from snapshot modules.
|
||||
SnapshotSharedLibs []string `blueprint:"mutated"`
|
||||
SnapshotStaticLibs []string `blueprint:"mutated"`
|
||||
SnapshotRuntimeLibs []string `blueprint:"mutated"`
|
||||
|
||||
Installable *bool
|
||||
@@ -2856,6 +2857,8 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
||||
c.Properties.AndroidMkStaticLibs = append(
|
||||
c.Properties.AndroidMkStaticLibs, makeLibName)
|
||||
}
|
||||
// Record BaseLibName for snapshots.
|
||||
c.Properties.SnapshotStaticLibs = append(c.Properties.SnapshotStaticLibs, BaseLibName(depName))
|
||||
}
|
||||
} else if !c.IsStubs() {
|
||||
// Stubs lib doesn't link to the runtime lib, object, crt, etc. dependencies.
|
||||
@@ -3179,6 +3182,13 @@ func (c *Module) Binary() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (c *Module) StaticExecutable() bool {
|
||||
if b, ok := c.linker.(*binaryDecorator); ok {
|
||||
return b.static()
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (c *Module) Object() bool {
|
||||
if o, ok := c.linker.(interface {
|
||||
object() bool
|
||||
|
Reference in New Issue
Block a user