Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ddf444d authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Add min_sdk_version prop to snapshots" am: 0933fd59 am: 2f445ce3 

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



Change-Id: I0b274470100579b405c10d3ec1e012d593bc8c94
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a447f6a3 2f445ce3

cc/vendor_snapshot.go

+2 −0
Original line number Diff line number Diff line
@@ -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()...) {

cc/vndk.go

+2 −0
Original line number Diff line number Diff line
@@ -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)