c8cb0c3eb5
sdk Previously in aosp/1907152, targetSdkVersion for all modules would be 10000 in release builds. This would cause sdk compatibility errors like b/209301265#3 for modules that were targeting a released SDK This CL adds an additional check to set targetSdkVersion to 10000 only if a module's apilevel is in preview (i.e. unreleased SDK) Bug: 209301265 Test: Built various apk combinations locally, and used aapt2 to check targetSdkVersion Test: TARGET_BUILD_APPS=xyz m CaptivePortalLoginTests # targetSdkVersion: 30 Test: m CaptivePortalLoginTests #targetSdkVersion: 30 Test: (internal) TARGET_BUILD_APPS=xyz m MediaProviderGoogle # targetSdkVersion: 10000 Test: (internal) m MediaProviderGoogle #targetSdkVersion: Tiramisu Change-Id: Id2901f23d4e1b436f8906940e47edd606a93657d
167 lines
5.7 KiB
Go
167 lines
5.7 KiB
Go
// Copyright 2018 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package java
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/google/blueprint"
|
|
|
|
"android/soong/android"
|
|
"android/soong/dexpreopt"
|
|
)
|
|
|
|
var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer",
|
|
blueprint.RuleParams{
|
|
Command: `${config.ManifestFixerCmd} ` +
|
|
`--minSdkVersion ${minSdkVersion} ` +
|
|
`--targetSdkVersion ${targetSdkVersion} ` +
|
|
`--raise-min-sdk-version ` +
|
|
`$args $in $out`,
|
|
CommandDeps: []string{"${config.ManifestFixerCmd}"},
|
|
},
|
|
"minSdkVersion", "targetSdkVersion", "args")
|
|
|
|
var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger",
|
|
blueprint.RuleParams{
|
|
Command: `${config.ManifestMergerCmd} $args --main $in $libs --out $out`,
|
|
CommandDeps: []string{"${config.ManifestMergerCmd}"},
|
|
},
|
|
"args", "libs")
|
|
|
|
// targetSdkVersion for manifest_fixer
|
|
// When TARGET_BUILD_APPS is not empty, this method returns 10000 for modules targeting an unreleased SDK
|
|
// This enables release builds (that run with TARGET_BUILD_APPS=[val...]) to target APIs that have not yet been finalized as part of an SDK
|
|
func targetSdkVersionForManifestFixer(ctx android.ModuleContext, sdkContext android.SdkContext) string {
|
|
targetSdkVersionSpec := sdkContext.TargetSdkVersion(ctx)
|
|
if ctx.Config().UnbundledBuildApps() && targetSdkVersionSpec.ApiLevel.IsPreview() {
|
|
return strconv.Itoa(android.FutureApiLevel.FinalOrFutureInt())
|
|
}
|
|
targetSdkVersion, err := targetSdkVersionSpec.EffectiveVersionString(ctx)
|
|
if err != nil {
|
|
ctx.ModuleErrorf("invalid targetSdkVersion: %s", err)
|
|
}
|
|
return targetSdkVersion
|
|
}
|
|
|
|
// Uses manifest_fixer.py to inject minSdkVersion, etc. into an AndroidManifest.xml
|
|
func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext android.SdkContext,
|
|
classLoaderContexts dexpreopt.ClassLoaderContextMap, isLibrary, useEmbeddedNativeLibs, usesNonSdkApis,
|
|
useEmbeddedDex, hasNoCode bool, loggingParent string) android.Path {
|
|
|
|
var args []string
|
|
if isLibrary {
|
|
args = append(args, "--library")
|
|
} else {
|
|
minSdkVersion, err := sdkContext.MinSdkVersion(ctx).EffectiveVersion(ctx)
|
|
if err != nil {
|
|
ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
|
|
}
|
|
if minSdkVersion.FinalOrFutureInt() >= 23 {
|
|
args = append(args, fmt.Sprintf("--extract-native-libs=%v", !useEmbeddedNativeLibs))
|
|
} else if useEmbeddedNativeLibs {
|
|
ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%d doesn't support it",
|
|
minSdkVersion)
|
|
}
|
|
}
|
|
|
|
if usesNonSdkApis {
|
|
args = append(args, "--uses-non-sdk-api")
|
|
}
|
|
|
|
if useEmbeddedDex {
|
|
args = append(args, "--use-embedded-dex")
|
|
}
|
|
|
|
// manifest_fixer should add only the implicit SDK libraries inferred by Soong, not those added
|
|
// explicitly via `uses_libs`/`optional_uses_libs`.
|
|
requiredUsesLibs, optionalUsesLibs := classLoaderContexts.ImplicitUsesLibs()
|
|
for _, usesLib := range requiredUsesLibs {
|
|
args = append(args, "--uses-library", usesLib)
|
|
}
|
|
for _, usesLib := range optionalUsesLibs {
|
|
args = append(args, "--optional-uses-library", usesLib)
|
|
}
|
|
|
|
if hasNoCode {
|
|
args = append(args, "--has-no-code")
|
|
}
|
|
|
|
if loggingParent != "" {
|
|
args = append(args, "--logging-parent", loggingParent)
|
|
}
|
|
var deps android.Paths
|
|
targetSdkVersion := targetSdkVersionForManifestFixer(ctx, sdkContext)
|
|
|
|
if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" {
|
|
targetSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String())
|
|
deps = append(deps, ApiFingerprintPath(ctx))
|
|
}
|
|
|
|
minSdkVersion, err := sdkContext.MinSdkVersion(ctx).EffectiveVersionString(ctx)
|
|
if err != nil {
|
|
ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
|
|
}
|
|
if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" {
|
|
minSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String())
|
|
deps = append(deps, ApiFingerprintPath(ctx))
|
|
}
|
|
|
|
fixedManifest := android.PathForModuleOut(ctx, "manifest_fixer", "AndroidManifest.xml")
|
|
if err != nil {
|
|
ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
|
|
}
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: manifestFixerRule,
|
|
Description: "fix manifest",
|
|
Input: manifest,
|
|
Implicits: deps,
|
|
Output: fixedManifest,
|
|
Args: map[string]string{
|
|
"minSdkVersion": minSdkVersion,
|
|
"targetSdkVersion": targetSdkVersion,
|
|
"args": strings.Join(args, " "),
|
|
},
|
|
})
|
|
|
|
return fixedManifest.WithoutRel()
|
|
}
|
|
|
|
func manifestMerger(ctx android.ModuleContext, manifest android.Path, staticLibManifests android.Paths,
|
|
isLibrary bool) android.Path {
|
|
|
|
var args string
|
|
if !isLibrary {
|
|
// Follow Gradle's behavior, only pass --remove-tools-declarations when merging app manifests.
|
|
args = "--remove-tools-declarations"
|
|
}
|
|
|
|
mergedManifest := android.PathForModuleOut(ctx, "manifest_merger", "AndroidManifest.xml")
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: manifestMergerRule,
|
|
Description: "merge manifest",
|
|
Input: manifest,
|
|
Implicits: staticLibManifests,
|
|
Output: mergedManifest,
|
|
Args: map[string]string{
|
|
"libs": android.JoinWithPrefix(staticLibManifests.Strings(), "--libs "),
|
|
"args": args,
|
|
},
|
|
})
|
|
|
|
return mergedManifest.WithoutRel()
|
|
}
|