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

Revert "Update min_sdk_version from SdkSpec to ApiLevel"

Browse Source 
Revert submission 2457063

Reason for revert: Broken udc-dev

Reverted changes: /q/submissionid:2457063

Change-Id: Id6349fc1318877044af713c914a0afd437d3d2d5
This commit is contained in:
Spandan Das
2023-03-21 01:36:46 +00:00
committed by Gerrit Code Review
parent e773739787
commit b74d1e1d91
18 changed files with 71 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/droiddoc.go
View File

@@ -248,8 +248,8 @@ func (j *Javadoc) SystemModules() string {
return proptools.String(j.properties.System_modules)
}
func (j *Javadoc) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {
return j.SdkVersion(ctx).ApiLevel
func (j *Javadoc) MinSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {
return j.SdkVersion(ctx)
}
func (j *Javadoc) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec {
@@ -304,7 +304,7 @@ func (j *Javadoc) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Op
flags = append(flags, "-I"+src.String())
}
minSdkVersion := j.MinSdkVersion(ctx).FinalOrFutureInt()
minSdkVersion := j.MinSdkVersion(ctx).ApiLevel.FinalOrFutureInt()
flags = append(flags, fmt.Sprintf("--min_sdk_version=%v", minSdkVersion))
return strings.Join(flags, " "), deps