Previous CL Ia9b34aa92ebb1b4de96ea0f8f290d798be19b2cf introduced asymmetry in handling "boot" and "apex" boot images: in JIT-zygote experiment, though the "apex" boot image was installed, the "boot" boot image was still used for generating dexpreopt configs. It is unclear why this asymmetry was needed at that point; it seems incorrect to use different boot images for dexpreopting and for installing on device. After recent changes the asymmetry started breaking walleye_jitzygote-userdebug on git_rvc-release, because APK dexpreopt commands refer to inexistent boot image files. Test: lunch aosp_walleye-userdebug && m Test: cherry-pick CL in internal, walleye_jitzygote-userdebug boots Change-Id: Id877c10269cf79caf6ae74b1dc169a31e6a2211b
196 lines
6.0 KiB
Go
196 lines
6.0 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 (
|
|
"android/soong/android"
|
|
"android/soong/dexpreopt"
|
|
)
|
|
|
|
type dexpreopter struct {
|
|
dexpreoptProperties DexpreoptProperties
|
|
|
|
installPath android.InstallPath
|
|
uncompressedDex bool
|
|
isSDKLibrary bool
|
|
isTest bool
|
|
isInstallable bool
|
|
isPresignedPrebuilt bool
|
|
|
|
manifestFile android.Path
|
|
usesLibs []string
|
|
optionalUsesLibs []string
|
|
enforceUsesLibs bool
|
|
libraryPaths map[string]android.Path
|
|
|
|
builtInstalled string
|
|
}
|
|
|
|
type DexpreoptProperties struct {
|
|
Dex_preopt struct {
|
|
// If false, prevent dexpreopting. Defaults to true.
|
|
Enabled *bool
|
|
|
|
// If true, generate an app image (.art file) for this module.
|
|
App_image *bool
|
|
|
|
// If true, use a checked-in profile to guide optimization. Defaults to false unless
|
|
// a matching profile is set or a profile is found in PRODUCT_DEX_PREOPT_PROFILE_DIR
|
|
// that matches the name of this module, in which case it is defaulted to true.
|
|
Profile_guided *bool
|
|
|
|
// If set, provides the path to profile relative to the Android.bp file. If not set,
|
|
// defaults to searching for a file that matches the name of this module in the default
|
|
// profile location set by PRODUCT_DEX_PREOPT_PROFILE_DIR, or empty if not found.
|
|
Profile *string `android:"path"`
|
|
}
|
|
}
|
|
|
|
func (d *dexpreopter) dexpreoptDisabled(ctx android.ModuleContext) bool {
|
|
global := dexpreoptGlobalConfig(ctx)
|
|
|
|
if global.DisablePreopt {
|
|
return true
|
|
}
|
|
|
|
if inList(ctx.ModuleName(), global.DisablePreoptModules) {
|
|
return true
|
|
}
|
|
|
|
if ctx.Config().UnbundledBuild() {
|
|
return true
|
|
}
|
|
|
|
if d.isTest {
|
|
return true
|
|
}
|
|
|
|
if !BoolDefault(d.dexpreoptProperties.Dex_preopt.Enabled, true) {
|
|
return true
|
|
}
|
|
|
|
if !d.isInstallable {
|
|
return true
|
|
}
|
|
|
|
// TODO: contains no java code
|
|
|
|
return false
|
|
}
|
|
|
|
func odexOnSystemOther(ctx android.ModuleContext, installPath android.InstallPath) bool {
|
|
return dexpreopt.OdexOnSystemOtherByName(ctx.ModuleName(), android.InstallPathToOnDevicePath(ctx, installPath), dexpreoptGlobalConfig(ctx))
|
|
}
|
|
|
|
func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.ModuleOutPath) android.ModuleOutPath {
|
|
if d.dexpreoptDisabled(ctx) {
|
|
return dexJarFile
|
|
}
|
|
|
|
global := dexpreoptGlobalConfig(ctx)
|
|
bootImage := defaultBootImageConfig(ctx)
|
|
|
|
var archs []android.ArchType
|
|
for _, a := range ctx.MultiTargets() {
|
|
archs = append(archs, a.Arch.ArchType)
|
|
}
|
|
if len(archs) == 0 {
|
|
// assume this is a java library, dexpreopt for all arches for now
|
|
for _, target := range ctx.Config().Targets[android.Android] {
|
|
if target.NativeBridge == android.NativeBridgeDisabled {
|
|
archs = append(archs, target.Arch.ArchType)
|
|
}
|
|
}
|
|
if inList(ctx.ModuleName(), global.SystemServerJars) && !d.isSDKLibrary {
|
|
// If the module is not an SDK library and it's a system server jar, only preopt the primary arch.
|
|
archs = archs[:1]
|
|
}
|
|
}
|
|
|
|
var images android.Paths
|
|
var imagesDeps []android.OutputPaths
|
|
for _, arch := range archs {
|
|
images = append(images, bootImage.images[arch])
|
|
imagesDeps = append(imagesDeps, bootImage.imagesDeps[arch])
|
|
}
|
|
|
|
dexLocation := android.InstallPathToOnDevicePath(ctx, d.installPath)
|
|
|
|
var profileClassListing android.OptionalPath
|
|
var profileBootListing android.OptionalPath
|
|
profileIsTextListing := false
|
|
if BoolDefault(d.dexpreoptProperties.Dex_preopt.Profile_guided, true) {
|
|
// If dex_preopt.profile_guided is not set, default it based on the existence of the
|
|
// dexprepot.profile option or the profile class listing.
|
|
if String(d.dexpreoptProperties.Dex_preopt.Profile) != "" {
|
|
profileClassListing = android.OptionalPathForPath(
|
|
android.PathForModuleSrc(ctx, String(d.dexpreoptProperties.Dex_preopt.Profile)))
|
|
profileBootListing = android.ExistentPathForSource(ctx,
|
|
ctx.ModuleDir(), String(d.dexpreoptProperties.Dex_preopt.Profile)+"-boot")
|
|
profileIsTextListing = true
|
|
} else {
|
|
profileClassListing = android.ExistentPathForSource(ctx,
|
|
global.ProfileDir, ctx.ModuleName()+".prof")
|
|
}
|
|
}
|
|
|
|
dexpreoptConfig := dexpreopt.ModuleConfig{
|
|
Name: ctx.ModuleName(),
|
|
DexLocation: dexLocation,
|
|
BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").OutputPath,
|
|
DexPath: dexJarFile,
|
|
ManifestPath: d.manifestFile,
|
|
UncompressedDex: d.uncompressedDex,
|
|
HasApkLibraries: false,
|
|
PreoptFlags: nil,
|
|
|
|
ProfileClassListing: profileClassListing,
|
|
ProfileIsTextListing: profileIsTextListing,
|
|
ProfileBootListing: profileBootListing,
|
|
|
|
EnforceUsesLibraries: d.enforceUsesLibs,
|
|
PresentOptionalUsesLibraries: d.optionalUsesLibs,
|
|
UsesLibraries: d.usesLibs,
|
|
LibraryPaths: d.libraryPaths,
|
|
|
|
Archs: archs,
|
|
DexPreoptImages: images,
|
|
DexPreoptImagesDeps: imagesDeps,
|
|
DexPreoptImageLocations: bootImage.imageLocations,
|
|
|
|
PreoptBootClassPathDexFiles: bootImage.dexPathsDeps.Paths(),
|
|
PreoptBootClassPathDexLocations: bootImage.dexLocationsDeps,
|
|
|
|
PreoptExtractedApk: false,
|
|
|
|
NoCreateAppImage: !BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, true),
|
|
ForceCreateAppImage: BoolDefault(d.dexpreoptProperties.Dex_preopt.App_image, false),
|
|
|
|
PresignedPrebuilt: d.isPresignedPrebuilt,
|
|
}
|
|
|
|
dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, global, dexpreoptConfig)
|
|
if err != nil {
|
|
ctx.ModuleErrorf("error generating dexpreopt rule: %s", err.Error())
|
|
return dexJarFile
|
|
}
|
|
|
|
dexpreoptRule.Build(pctx, ctx, "dexpreopt", "dexpreopt")
|
|
|
|
d.builtInstalled = dexpreoptRule.Installs().String()
|
|
|
|
return dexJarFile
|
|
}
|