|
@@ -242,10 +242,12 @@ type snapshotJsonFlags struct {
|
|
|
SanitizeUbsanDep bool `json:",omitempty"`
|
|
|
|
|
|
// binary flags
|
|
|
- Symlinks []string `json:",omitempty"`
|
|
|
+ Symlinks []string `json:",omitempty"`
|
|
|
+ StaticExecutable bool `json:",omitempty"`
|
|
|
|
|
|
// dependencies
|
|
|
SharedLibs []string `json:",omitempty"`
|
|
|
+ StaticLibs []string `json:",omitempty"`
|
|
|
RuntimeLibs []string `json:",omitempty"`
|
|
|
Required []string `json:",omitempty"`
|
|
|
|
|
@@ -381,6 +383,8 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
|
|
|
if m.Shared() {
|
|
|
prop.SharedLibs = m.SnapshotSharedLibs()
|
|
|
}
|
|
|
+ // static libs dependencies are required to collect the NOTICE files.
|
|
|
+ prop.StaticLibs = m.SnapshotStaticLibs()
|
|
|
if sanitizable, ok := m.(PlatformSanitizeable); ok {
|
|
|
if sanitizable.Static() && sanitizable.SanitizePropDefined() {
|
|
|
prop.SanitizeMinimalDep = sanitizable.MinimalRuntimeDep() || sanitizable.MinimalRuntimeNeeded()
|
|
@@ -426,8 +430,10 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
|
|
|
} else if m.Binary() {
|
|
|
// binary flags
|
|
|
prop.Symlinks = m.Symlinks()
|
|
|
+ prop.StaticExecutable = m.StaticExecutable()
|
|
|
prop.SharedLibs = m.SnapshotSharedLibs()
|
|
|
-
|
|
|
+ // static libs dependencies are required to collect the NOTICE files.
|
|
|
+ prop.StaticLibs = m.SnapshotStaticLibs()
|
|
|
// install bin
|
|
|
binPath := m.OutputFile().Path()
|
|
|
snapshotBinOut := filepath.Join(snapshotArchDir, targetArch, "binary", binPath.Base())
|