diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/android_manifest.go | 14 | ||||
| -rw-r--r-- | java/sdk.go | 20 |
2 files changed, 10 insertions, 24 deletions
diff --git a/java/android_manifest.go b/java/android_manifest.go index dc7a3fc7e..021883e60 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -93,11 +93,13 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext 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 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext 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 73b7dcf78..66eb284ba 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -47,29 +47,13 @@ type sdkContext interface { 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 - } - if UseApiFingerprint(ctx, sdkVersion) { - apiFingerprint := ApiFingerprintPath(ctx) - sdkVersion += fmt.Sprintf(".$$(cat %s)", apiFingerprint.String()) + return v } - return sdkVersion } // Returns a sdk version as a number. For modules targeting an unreleased SDK (meaning it does not yet have a number) |