9231537fe2
Previously, SdkSpec was constructed only from the user string. It didn't make use of the Config struct where information about the latest stable SDK version, etc. is recorded. As a result, the build system couldn't check if the sdk version "current" is referring to the in-development (i.e. not-yet-frozen) SDK version or the latest stable version. "current" was always assumed to be in-development (IsPreview() returns true) even when Platform_sdk_final == true. As the first step for fixing that, this change requires android.EarlyModuleContext to be passed when constructing SdkSpec from the user string. In the following changes, "current" will be mapped to either FutureApiLevel (10000) or one of the FinalApiLevels() depending on whether the platform SDK was finalized or not. Bug: 175678607 Test: m Change-Id: Ifea12ebf147ecccf12e7266dd382819806571543
151 lines
4.8 KiB
Go
151 lines
4.8 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"
|
|
"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")
|
|
|
|
// 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")
|
|
}
|
|
|
|
for _, usesLib := range classLoaderContexts.UsesLibs() {
|
|
if inList(usesLib, dexpreopt.OptionalCompatUsesLibs) {
|
|
args = append(args, "--optional-uses-library", usesLib)
|
|
} else {
|
|
args = append(args, "--uses-library", usesLib)
|
|
}
|
|
}
|
|
|
|
if hasNoCode {
|
|
args = append(args, "--has-no-code")
|
|
}
|
|
|
|
if loggingParent != "" {
|
|
args = append(args, "--logging-parent", loggingParent)
|
|
}
|
|
var deps android.Paths
|
|
targetSdkVersion, err := sdkContext.TargetSdkVersion(ctx).EffectiveVersionString(ctx)
|
|
if err != nil {
|
|
ctx.ModuleErrorf("invalid targetSdkVersion: %s", err)
|
|
}
|
|
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()
|
|
}
|