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

Commit a3654e6e authored by Sam Delmerico's avatar Sam Delmerico Committed by Automerger Merge Worker
Browse files

Merge changes from topics "apex_available_name-bp2build", "variant_version-bp2build" am: 013f6f22 

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



Change-Id: I32604c9c9d7d22b1844b7894371d9bbf6995f869
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e349b00 013f6f22

apex/apex.go

+2 −0
Original line number Diff line number Diff line
@@ -3531,6 +3531,7 @@ type bazelApexBundleAttributes struct { 
	Tests                 bazel.LabelListAttribute

	Base_apex_name        *string

	Apex_available_name   *string

	Variant_version       *string

}



type convertedNativeSharedLibs struct {
@@ -3682,6 +3683,7 @@ func convertWithBp2build(a *apexBundle, ctx android.TopDownMutatorContext) (baze 
		Logging_parent:        loggingParent,

		Tests:                 testsAttrs,

		Apex_available_name:   a.properties.Apex_available_name,

		Variant_version:       a.properties.Variant_version,

	}



	props := bazel.BazelTargetModuleProperties{