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

Merge "Revert "Allow codename.fingerprint format for minSdkVersion""

Browse Source 
am: 070d69c74c

Change-Id: Iaa25e4c1211e370a5c520c0a96ba4fd5f6dff42f
This commit is contained in:
Pete Gillin
2020-01-21 06:16:35 -08:00
committed by android-build-merger
parent b472304a75 070d69c74c
commit 42a16b7d69
3 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apex/builder.go
View File

@@ -376,17 +376,15 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
} }
targetSdkVersion := ctx.Config().DefaultAppTargetSdk() targetSdkVersion := ctx.Config().DefaultAppTargetSdk()
minSdkVersion := ctx.Config().DefaultAppTargetSdk() if targetSdkVersion == ctx.Config().PlatformSdkCodename() &&
if java.UseApiFingerprint(ctx, targetSdkVersion) { ctx.Config().UnbundledBuild() &&
targetSdkVersion += fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String()) !ctx.Config().UnbundledBuildUsePrebuiltSdks() &&
implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx)) ctx.Config().IsEnvTrue("UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT") {
} apiFingerprint := java.ApiFingerprintPath(ctx)
if java.UseApiFingerprint(ctx, minSdkVersion) { targetSdkVersion += fmt.Sprintf(".$$(cat %s)", apiFingerprint.String())
minSdkVersion += fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String()) implicitInputs = append(implicitInputs, apiFingerprint)
implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx))
} }
optFlags = append(optFlags, "--target_sdk_version "+targetSdkVersion) optFlags = append(optFlags, "--target_sdk_version "+targetSdkVersion)
optFlags = append(optFlags, "--min_sdk_version "+minSdkVersion)
noticeFile := a.buildNoticeFile(ctx, a.Name()+suffix) noticeFile := a.buildNoticeFile(ctx, a.Name()+suffix)
if noticeFile.Valid() { if noticeFile.Valid() {

10
java/android_manifest.go
View File

@@ -93,10 +93,12 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext
var deps android.Paths var deps android.Paths
targetSdkVersion := sdkVersionOrDefault(ctx, sdkContext.targetSdkVersion()) targetSdkVersion := sdkVersionOrDefault(ctx, sdkContext.targetSdkVersion())
minSdkVersion := sdkVersionOrDefault(ctx, sdkContext.minSdkVersion()) if targetSdkVersion == ctx.Config().PlatformSdkCodename() &&
if (UseApiFingerprint(ctx, sdkContext.targetSdkVersion()) || ctx.Config().UnbundledBuild() &&
UseApiFingerprint(ctx, sdkContext.minSdkVersion())) { !ctx.Config().UnbundledBuildUsePrebuiltSdks() &&
ctx.Config().IsEnvTrue("UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT") {
apiFingerprint := ApiFingerprintPath(ctx) apiFingerprint := ApiFingerprintPath(ctx)
targetSdkVersion += fmt.Sprintf(".$$(cat %s)", apiFingerprint.String())
deps = append(deps, apiFingerprint) deps = append(deps, apiFingerprint)
} }
@@ -108,7 +110,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext
Implicits: deps, Implicits: deps,
Output: fixedManifest, Output: fixedManifest,
Args: map[string]string{ Args: map[string]string{
"minSdkVersion": minSdkVersion, "minSdkVersion": sdkVersionOrDefault(ctx, sdkContext.minSdkVersion()),
"targetSdkVersion": targetSdkVersion, "targetSdkVersion": targetSdkVersion,
"args": strings.Join(args, " "), "args": strings.Join(args, " "),
}, },

20
java/sdk.go
View File

@@ -47,29 +47,13 @@ type sdkContext interface {
targetSdkVersion() string targetSdkVersion() string
} }
func UseApiFingerprint(ctx android.BaseModuleContext, v string) bool {
if v == ctx.Config().PlatformSdkCodename() &&
ctx.Config().UnbundledBuild() &&
!ctx.Config().UnbundledBuildUsePrebuiltSdks() &&
ctx.Config().IsEnvTrue("UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT") {
return true
}
return false
}
func sdkVersionOrDefault(ctx android.BaseModuleContext, v string) string { func sdkVersionOrDefault(ctx android.BaseModuleContext, v string) string {
var sdkVersion string
switch v { switch v {
case "", "none", "current", "test_current", "system_current", "core_current", "core_platform": case "", "none", "current", "test_current", "system_current", "core_current", "core_platform":
sdkVersion = ctx.Config().DefaultAppTargetSdk() return ctx.Config().DefaultAppTargetSdk()
default: default:
sdkVersion = v return v
} }
if UseApiFingerprint(ctx, sdkVersion) {
apiFingerprint := ApiFingerprintPath(ctx)
sdkVersion += fmt.Sprintf(".$$(cat %s)", apiFingerprint.String())
}
return sdkVersion
} }
// Returns a sdk version as a number. For modules targeting an unreleased SDK (meaning it does not yet have a number) // Returns a sdk version as a number. For modules targeting an unreleased SDK (meaning it does not yet have a number)