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

Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA

Browse Source 
UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA enables user to specify
${codename}.${sha} as min_sdk_version and target_sdk_version in order to
support mainline train building into android build.

Test: TH
Bug: 295905124
Change-Id: I032d464aaa7314520f98b8eafa53d962940075ce
This commit is contained in:
Jihoon Kang
2024-02-08 01:41:51 +00:00
parent 7870d329a5
commit 842b999a53
4 changed files with 108 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apex/builder.go
View File

@@ -695,18 +695,20 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) {
if moduleMinSdkVersion.IsCurrent() || moduleMinSdkVersion.IsNone() {
minSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
if java.UseApiFingerprint(ctx) {
minSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String())
implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx))
if useApiFingerprint, fingerprintMinSdkVersion, fingerprintDeps :=
java.UseApiFingerprint(ctx); useApiFingerprint {
minSdkVersion = fingerprintMinSdkVersion
implicitInputs = append(implicitInputs, fingerprintDeps)
}
}
// apex module doesn't have a concept of target_sdk_version, hence for the time
// being targetSdkVersion == default targetSdkVersion of the branch.
targetSdkVersion := strconv.Itoa(ctx.Config().DefaultAppTargetSdk(ctx).FinalOrFutureInt())
if java.UseApiFingerprint(ctx) {
targetSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String())
implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx))
if useApiFingerprint, fingerprintTargetSdkVersion, fingerprintDeps :=
java.UseApiFingerprint(ctx); useApiFingerprint {
targetSdkVersion = fingerprintTargetSdkVersion
implicitInputs = append(implicitInputs, fingerprintDeps)
}
optFlags = append(optFlags, "--target_sdk_version "+targetSdkVersion)
optFlags = append(optFlags, "--min_sdk_version "+minSdkVersion)