Revert "Allow codename.fingerprint format for minSdkVersion"
This reverts commit 014a85712d14072aac171a972e3e2fbe3ccd0912.
Reason for revert: Caused vendor/google/build/build_mainline_modules.sh to fail with `Error: minSdkVersion (10000) is greater than maxSdkVersion (30)`.
Bug: 130541924
Change-Id: Ifa233bf40a674481d21b61ee816c5fdde8201080
diff --git a/java/android_manifest.go b/java/android_manifest.go
index dc7a3fc..021883e 100644
--- a/java/android_manifest.go
+++ b/java/android_manifest.go
@@ -93,11 +93,13 @@
var deps android.Paths
targetSdkVersion := sdkVersionOrDefault(ctx, sdkContext.targetSdkVersion())
- minSdkVersion := sdkVersionOrDefault(ctx, sdkContext.minSdkVersion())
- if (UseApiFingerprint(ctx, sdkContext.targetSdkVersion()) ||
- UseApiFingerprint(ctx, sdkContext.minSdkVersion())) {
- apiFingerprint := ApiFingerprintPath(ctx)
- deps = append(deps, apiFingerprint)
+ if targetSdkVersion == ctx.Config().PlatformSdkCodename() &&
+ ctx.Config().UnbundledBuild() &&
+ !ctx.Config().UnbundledBuildUsePrebuiltSdks() &&
+ ctx.Config().IsEnvTrue("UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT") {
+ apiFingerprint := ApiFingerprintPath(ctx)
+ targetSdkVersion += fmt.Sprintf(".$$(cat %s)", apiFingerprint.String())
+ deps = append(deps, apiFingerprint)
}
fixedManifest := android.PathForModuleOut(ctx, "manifest_fixer", "AndroidManifest.xml")
@@ -108,7 +110,7 @@
Implicits: deps,
Output: fixedManifest,
Args: map[string]string{
- "minSdkVersion": minSdkVersion,
+ "minSdkVersion": sdkVersionOrDefault(ctx, sdkContext.minSdkVersion()),
"targetSdkVersion": targetSdkVersion,
"args": strings.Join(args, " "),
},
diff --git a/java/sdk.go b/java/sdk.go
index 73b7dcf..66eb284 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -47,29 +47,13 @@
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 {
- var sdkVersion string
switch v {
case "", "none", "current", "test_current", "system_current", "core_current", "core_platform":
- sdkVersion = ctx.Config().DefaultAppTargetSdk()
+ return ctx.Config().DefaultAppTargetSdk()
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)