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

Commit 7898ac92 authored by Zhi Dou's avatar Zhi Dou Committed by Automerger Merge Worker
Browse files

Merge "Make min_sdk overridable in override_apex" am: 7fc88d5f am: 507c8362 

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



Change-Id: I65812eddebdbb4acbd5c0c7f097e850af42aca2a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf30cfb0 507c8362

apex/apex.go

+7 −7
Original line number Diff line number Diff line
@@ -124,10 +124,6 @@ type apexBundleProperties struct { 
	// List of filesystem images that are embedded inside this APEX bundle.

	Filesystems []string



	// The minimum SDK version that this APEX must support at minimum. This is usually set to

	// the SDK version that the APEX was first introduced.

	Min_sdk_version *string



	// Whether this APEX is considered updatable or not. When set to true, this will enforce

	// additional rules for making sure that the APEX is truly updatable. To be updatable,

	// min_sdk_version should be set as well. This will also disable the size optimizations like
@@ -393,6 +389,10 @@ type overridableProperties struct { 


	// Trim against a specific Dynamic Common Lib APEX

	Trim_against *string



	// The minimum SDK version that this APEX must support at minimum. This is usually set to

	// the SDK version that the APEX was first introduced.

	Min_sdk_version *string

}



type apexBundle struct {
@@ -2880,7 +2880,7 @@ func (a *apexBundle) minSdkVersionValue(ctx android.EarlyModuleContext) string { 
	// Only override the minSdkVersion value on Apexes which already specify

	// a min_sdk_version (it's optional for non-updatable apexes), and that its

	// min_sdk_version value is lower than the one to override with.

	minApiLevel := minSdkVersionFromValue(ctx, proptools.String(a.properties.Min_sdk_version))

	minApiLevel := minSdkVersionFromValue(ctx, proptools.String(a.overridableProperties.Min_sdk_version))

	if minApiLevel.IsNone() {

		return ""

	}
@@ -3534,8 +3534,8 @@ func convertWithBp2build(a *apexBundle, ctx android.TopDownMutatorContext) (baze 
	// TODO(b/219503907) this would need to be set to a.MinSdkVersionValue(ctx) but

	// given it's coming via config, we probably don't want to put it in here.

	var minSdkVersion bazel.StringAttribute

	if a.properties.Min_sdk_version != nil {

		minSdkVersion.SetValue(*a.properties.Min_sdk_version)

	if a.overridableProperties.Min_sdk_version != nil {

		minSdkVersion.SetValue(*a.overridableProperties.Min_sdk_version)

	}

	if props, ok := productVariableProps[minSdkVersionPropName]; ok {

		for c, p := range props {