From 5860f8227c135b6ac3986a1699b61a60505d8f35 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Tue, 18 Apr 2023 11:30:22 +0900 Subject: [PATCH] Add min_sdk_version prop to snapshots Bug: 277403349 Test: build vndk/vendor snapshot and build Change-Id: I226032bb0f9356cdef6747daec6ceb06589d9cbb --- cc/vendor_snapshot.go | 2 ++ cc/vndk.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go index 9b12bfa18..aed37753a 100644 --- a/cc/vendor_snapshot.go +++ b/cc/vendor_snapshot.go @@ -157,6 +157,7 @@ type snapshotJsonFlags struct { // extra config files InitRc []string `json:",omitempty"` VintfFragments []string `json:",omitempty"` + MinSdkVersion string `json:",omitempty"` } var ccSnapshotAction snapshot.GenerateSnapshotAction = func(s snapshot.SnapshotSingleton, ctx android.SingletonContext, snapshotArchDir string) android.Paths { @@ -249,6 +250,7 @@ var ccSnapshotAction snapshot.GenerateSnapshotAction = func(s snapshot.SnapshotS for _, path := range m.VintfFragments() { prop.VintfFragments = append(prop.VintfFragments, filepath.Join("configs", path.Base())) } + prop.MinSdkVersion = m.MinSdkVersion() // install config files. ignores any duplicates. for _, path := range append(m.InitRc(), m.VintfFragments()...) { diff --git a/cc/vndk.go b/cc/vndk.go index be66cd79f..30bfdd89f 100644 --- a/cc/vndk.go +++ b/cc/vndk.go @@ -706,6 +706,7 @@ func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContex // json struct to export snapshot information prop := struct { + MinSdkVersion string `json:",omitempty"` LicenseKinds []string `json:",omitempty"` LicenseTexts []string `json:",omitempty"` ExportedDirs []string `json:",omitempty"` @@ -716,6 +717,7 @@ func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContex prop.LicenseKinds = m.EffectiveLicenseKinds() prop.LicenseTexts = m.EffectiveLicenseFiles().Strings() + prop.MinSdkVersion = m.MinSdkVersion() if ctx.Config().VndkSnapshotBuildArtifacts() { exportedInfo := ctx.ModuleProvider(m, FlagExporterInfoProvider).(FlagExporterInfo)