Merge "android_app APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE" into main am: 8763530dff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718294 Change-Id: I4d70528e0eda3cdf229c64ddb8cc99eb119015d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -936,6 +936,19 @@ func CheckMinSdkVersion(ctx ModuleContext, minSdkVersion ApiLevel, walk WalkPayl
|
||||
})
|
||||
}
|
||||
|
||||
// Construct ApiLevel object from min_sdk_version string value
|
||||
func MinSdkVersionFromValue(ctx EarlyModuleContext, value string) ApiLevel {
|
||||
if value == "" {
|
||||
return NoneApiLevel
|
||||
}
|
||||
apiLevel, err := ApiLevelFromUser(ctx, value)
|
||||
if err != nil {
|
||||
ctx.PropertyErrorf("min_sdk_version", "%s", err.Error())
|
||||
return NoneApiLevel
|
||||
}
|
||||
return apiLevel
|
||||
}
|
||||
|
||||
// Implemented by apexBundle.
|
||||
type ApexTestInterface interface {
|
||||
// Return true if the apex bundle is an apex_test
|
||||
|
Reference in New Issue
Block a user