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

Merge "Add min_sdk_version prop to snapshots" am: 0933fd59d7 am: 2f445ce30e am: 7ddf444d4d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2542470

Change-Id: I68159f27ee24d2e73e4d7bbbc265d28790a7592f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim
2023-04-20 09:45:27 +00:00
committed by Automerger Merge Worker
parent 7f7328af23 7ddf444d4d
commit be9da69fdc
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/vendor_snapshot.go
View File

@@ -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()...) {

2
cc/vndk.go
View File

@@ -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)