diff options
Diffstat (limited to 'cc/snapshot_utils.go')
| -rw-r--r-- | cc/snapshot_utils.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cc/snapshot_utils.go b/cc/snapshot_utils.go index 8eb616448..a17f11496 100644 --- a/cc/snapshot_utils.go +++ b/cc/snapshot_utils.go @@ -53,6 +53,10 @@ func (m *Module) SnapshotSharedLibs() []string { return m.Properties.SnapshotSharedLibs } +func (m *Module) SnapshotStaticLibs() []string { + return m.Properties.SnapshotStaticLibs +} + // snapshotLibraryInterface is an interface for libraries captured to VNDK / vendor snapshots. type snapshotLibraryInterface interface { libraryInterface @@ -102,14 +106,16 @@ func (s *snapshotMap) get(name string, arch android.ArchType) (snapshot string, // If it's true, collectHeadersForSnapshot will be called in GenerateAndroidBuildActions. func ShouldCollectHeadersForSnapshot(ctx android.ModuleContext, m LinkableInterface, apexInfo android.ApexInfo) bool { if ctx.DeviceConfig().VndkVersion() != "current" && - ctx.DeviceConfig().RecoverySnapshotVersion() != "current" { + ctx.DeviceConfig().RecoverySnapshotVersion() != "current" && + ctx.DeviceConfig().RamdiskSnapshotVersion() != "current" { return false } if _, ok := isVndkSnapshotAware(ctx.DeviceConfig(), m, apexInfo); ok { return ctx.Config().VndkSnapshotBuildArtifacts() } - for _, image := range []snapshotImage{vendorSnapshotImageSingleton, recoverySnapshotImageSingleton} { + for _, image := range []snapshotImage{vendorSnapshotImageSingleton, recoverySnapshotImageSingleton, + ramdiskSnapshotImageSingleton} { if isSnapshotAware(ctx.DeviceConfig(), m, image.isProprietaryPath(ctx.ModuleDir(), ctx.DeviceConfig()), apexInfo, image) { return true } |