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

Merge "Propagate max_sdk_version to manifest_fixer"

Browse Source
This commit is contained in:
William Loh
2022-07-14 00:20:35 +00:00
committed by Gerrit Code Review
parent ca53ed396c 5a082f9a33
commit 50dbe0a074
9 changed files with 136 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/base.go
View File

@@ -204,6 +204,10 @@ type DeviceProperties struct {
// Defaults to empty string "". See sdk_version for possible values.
Max_sdk_version *string
// if not blank, set the maxSdkVersion properties of permission and uses-permission tags.
// Defaults to empty string "". See sdk_version for possible values.
Replace_max_sdk_version_placeholder *string
// if not blank, set the targetSdkVersion in the AndroidManifest.xml.
// Defaults to sdk_version if not set. See sdk_version for possible values.
Target_sdk_version *string
@@ -649,6 +653,11 @@ func (j *Module) MaxSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {
return android.SdkSpecFrom(ctx, maxSdkVersion)
}
func (j *Module) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec {
replaceMaxSdkVersionPlaceholder := proptools.StringDefault(j.deviceProperties.Replace_max_sdk_version_placeholder, "")
return android.SdkSpecFrom(ctx, replaceMaxSdkVersionPlaceholder)
}
func (j *Module) MinSdkVersionString() string {
return j.minSdkVersion.Raw
}