f5d91bb3b4
This reverts commit 0b1c70efbc
.
The reverted commit was based on the idea that uses-libraries that are
explicitly specified in build files should not be implicitly added to
the manifest, as that would mean that anything added to the build files
will flow to the manifest.
Although this logic is correct, it prevents propagation of
uses-libraries from dependencies, which is wrong: if a library has an
explicit uses-library property in Android.bp, this property is expected
to be propagated to the library's dependencies. Failing to do so would
mean that every user of that library has to add uses-library property to
their build files, which doesn't scale (see b/214255490 for example).
Bug: 214255490
Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \
&& adb wait-for-device && adb root \
&& adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
# empty output, no errors at boot
Change-Id: I6f420e76a89aa2f37be99f877711736640f2c361
189 lines
6.1 KiB
Go
189 lines
6.1 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} ` +
|
|
`$args $in $out`,
|
|
CommandDeps: []string{"${config.ManifestFixerCmd}"},
|
|
},
|
|
"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
|
|
}
|
|
|
|
type ManifestFixerParams struct {
|
|
SdkContext android.SdkContext
|
|
ClassLoaderContexts dexpreopt.ClassLoaderContextMap
|
|
IsLibrary bool
|
|
UseEmbeddedNativeLibs bool
|
|
UsesNonSdkApis bool
|
|
UseEmbeddedDex bool
|
|
HasNoCode bool
|
|
TestOnly bool
|
|
LoggingParent string
|
|
}
|
|
|
|
// Uses manifest_fixer.py to inject minSdkVersion, etc. into an AndroidManifest.xml
|
|
func ManifestFixer(ctx android.ModuleContext, manifest android.Path,
|
|
params ManifestFixerParams) android.Path {
|
|
var args []string
|
|
|
|
if params.IsLibrary {
|
|
args = append(args, "--library")
|
|
} else if params.SdkContext != nil {
|
|
minSdkVersion, err := params.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", !params.UseEmbeddedNativeLibs))
|
|
} else if params.UseEmbeddedNativeLibs {
|
|
ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%s doesn't support it",
|
|
minSdkVersion.String())
|
|
}
|
|
}
|
|
|
|
if params.UsesNonSdkApis {
|
|
args = append(args, "--uses-non-sdk-api")
|
|
}
|
|
|
|
if params.UseEmbeddedDex {
|
|
args = append(args, "--use-embedded-dex")
|
|
}
|
|
|
|
if params.ClassLoaderContexts != nil {
|
|
// Libraries propagated via `uses_libs`/`optional_uses_libs` are also added (they may be
|
|
// propagated from dependencies).
|
|
requiredUsesLibs, optionalUsesLibs := params.ClassLoaderContexts.UsesLibs()
|
|
|
|
for _, usesLib := range requiredUsesLibs {
|
|
args = append(args, "--uses-library", usesLib)
|
|
}
|
|
for _, usesLib := range optionalUsesLibs {
|
|
args = append(args, "--optional-uses-library", usesLib)
|
|
}
|
|
}
|
|
|
|
if params.HasNoCode {
|
|
args = append(args, "--has-no-code")
|
|
}
|
|
|
|
if params.TestOnly {
|
|
args = append(args, "--test-only")
|
|
}
|
|
|
|
if params.LoggingParent != "" {
|
|
args = append(args, "--logging-parent", params.LoggingParent)
|
|
}
|
|
var deps android.Paths
|
|
var argsMapper = make(map[string]string)
|
|
|
|
if params.SdkContext != nil {
|
|
targetSdkVersion := targetSdkVersionForManifestFixer(ctx, params.SdkContext)
|
|
args = append(args, "--targetSdkVersion ", targetSdkVersion)
|
|
|
|
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 := params.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))
|
|
}
|
|
|
|
if err != nil {
|
|
ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
|
|
}
|
|
args = append(args, "--minSdkVersion ", minSdkVersion)
|
|
args = append(args, "--raise-min-sdk-version")
|
|
}
|
|
|
|
fixedManifest := android.PathForModuleOut(ctx, "manifest_fixer", "AndroidManifest.xml")
|
|
argsMapper["args"] = strings.Join(args, " ")
|
|
|
|
ctx.Build(pctx, android.BuildParams{
|
|
Rule: manifestFixerRule,
|
|
Description: "fix manifest",
|
|
Input: manifest,
|
|
Implicits: deps,
|
|
Output: fixedManifest,
|
|
Args: argsMapper,
|
|
})
|
|
|
|
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()
|
|
}
|