Fix the args used to dexpreopt system server jars in prebuilt apexes
For prebuilts, java.dexpreopt gets called twice 1. in the context of the top-level prebuilt apex 2. in the context of the java_library shim Only the artifacts of (1) get installed. The artifacts generated by 2) are unused. However the args used to generate the artifacts of (1) are incorrect. It uses moduleName(ctx) to do special-handling of apex system server jars. This special-handling does not happen in (1), so although dexpreopt artficats get generated, they get generated with the wrong args. To fix this, add an additional parameter in java.dexpreopt to pass the libraryName explicitly. Details - Delete moduleName function. This was used to determine the java library name, which is no longer safe - Add a libraryName parameter to java.dexpreopt - Most module types will use j.Name() as libraryName - prebuilt_apex and apex_set will iterate over its `contents` and use each element as libraryName when invoking java.dexpreopt With the correct args passed from (1), we can drop j.dexpreopt from (2) completely. Dropping (2) also breaks profile guided dexpreopt tests. These currently operate on (2). They will be moved to (1) in the next CL of this stack. Test: presubmits Test: lunch cf_x86_64_auto-trunk_staging-userdebug && m nothing (this was a postsubmit failure with aosp/2923733) Test: art_standalone_dexpreopt_tests on next https://android-build.corp.google.com/builds/abtd/run/L86000030001579256 Test: art-gtest on git_master-art-host https://android-build.corp.google.com/builds/abtd/run/L07800030001550262 Bug: 308790457 Bug: 322255144 Change-Id: I8eb604c82f1fa5289d3cd1a20084d56e4d7485e3
This commit is contained in:
Spandan Das
parent
f5e03f1c1a
commit
e21a8d4dc6
9 changed files with 66 additions and 49 deletions
|
|
@ -316,6 +316,7 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) {
|
|||
java.CheckModuleDependencies(t, result.TestContext, "com.android.art", "android_common_com.android.art", []string{
|
||||
`art-bootclasspath-fragment`,
|
||||
`com.android.art.key`,
|
||||
`dex2oatd`,
|
||||
})
|
||||
|
||||
// Make sure that the source bootclasspath_fragment copies its dex files to the predefined
|
||||
|
|
@ -387,6 +388,7 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) {
|
|||
java.CheckModuleDependencies(t, result.TestContext, "com.android.art", "android_common_com.android.art", []string{
|
||||
`art-bootclasspath-fragment`,
|
||||
`com.android.art.key`,
|
||||
`dex2oatd`,
|
||||
`prebuilt_com.android.art`,
|
||||
})
|
||||
|
||||
|
|
@ -650,6 +652,7 @@ func TestBootclasspathFragmentContentsNoName(t *testing.T) {
|
|||
})
|
||||
|
||||
java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex", []string{
|
||||
`dex2oatd`,
|
||||
`myapex.key`,
|
||||
`mybootclasspathfragment`,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -201,6 +201,10 @@ func (p *prebuiltCommon) dexpreoptSystemServerJars(ctx android.ModuleContext) {
|
|||
if !p.hasExportedDeps() {
|
||||
return
|
||||
}
|
||||
// If this prebuilt apex has not been selected, return
|
||||
if p.IsHideFromMake() {
|
||||
return
|
||||
}
|
||||
// Use apex_name to determine the api domain of this prebuilt apex
|
||||
apexName := p.ApexVariationName()
|
||||
di, err := android.FindDeapexerProviderForModule(ctx)
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ func TestSystemserverclasspathFragmentContents(t *testing.T) {
|
|||
})
|
||||
|
||||
java.CheckModuleDependencies(t, ctx, "myapex", "android_common_myapex", []string{
|
||||
`dex2oatd`,
|
||||
`myapex.key`,
|
||||
`mysystemserverclasspathfragment`,
|
||||
})
|
||||
|
|
@ -162,6 +163,7 @@ func TestSystemserverclasspathFragmentNoGeneratedProto(t *testing.T) {
|
|||
})
|
||||
|
||||
java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex", []string{
|
||||
`dex2oatd`,
|
||||
`myapex.key`,
|
||||
`mysystemserverclasspathfragment`,
|
||||
})
|
||||
|
|
@ -219,6 +221,8 @@ func TestSystemServerClasspathFragmentWithContentNotInMake(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestPrebuiltSystemserverclasspathFragmentContents(t *testing.T) {
|
||||
// TODO(spandandas): Fix the rules for profile guided dexpreopt of deapexed prebuilt jars
|
||||
t.Skip()
|
||||
result := android.GroupFixturePreparers(
|
||||
prepareForTestWithSystemserverclasspathFragment,
|
||||
prepareForTestWithMyapex,
|
||||
|
|
@ -377,6 +381,8 @@ func TestSystemserverclasspathFragmentStandaloneContents(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestPrebuiltStandaloneSystemserverclasspathFragmentContents(t *testing.T) {
|
||||
// TODO(spandandas): Fix the rules for profile guided dexpreopt of deapexed prebuilt jars
|
||||
t.Skip()
|
||||
result := android.GroupFixturePreparers(
|
||||
prepareForTestWithSystemserverclasspathFragment,
|
||||
prepareForTestWithMyapex,
|
||||
|
|
|
|||
|
|
@ -431,7 +431,7 @@ func (a *AndroidApp) shouldUncompressDex(ctx android.ModuleContext) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
return shouldUncompressDex(ctx, &a.dexpreopter)
|
||||
return shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), &a.dexpreopter)
|
||||
}
|
||||
|
||||
func (a *AndroidApp) shouldEmbedJnis(ctx android.BaseModuleContext) bool {
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ func (a *AndroidAppImport) shouldUncompressDex(ctx android.ModuleContext) bool {
|
|||
return ctx.Config().UncompressPrivAppDex()
|
||||
}
|
||||
|
||||
return shouldUncompressDex(ctx, &a.dexpreopter)
|
||||
return shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), &a.dexpreopter)
|
||||
}
|
||||
|
||||
func (a *AndroidAppImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
|
|
@ -324,7 +324,7 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
|
|||
a.usesLibrary.verifyUsesLibrariesAPK(ctx, srcApk)
|
||||
}
|
||||
|
||||
a.dexpreopter.dexpreopt(ctx, jnisUncompressed)
|
||||
a.dexpreopter.dexpreopt(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), jnisUncompressed)
|
||||
if a.dexpreopter.uncompressedDex {
|
||||
dexUncompressed := android.PathForModuleOut(ctx, "dex-uncompressed", ctx.ModuleName()+".apk")
|
||||
ctx.Build(pctx, android.BuildParams{
|
||||
|
|
|
|||
|
|
@ -1626,7 +1626,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
|
|||
j.dexJarFile = makeDexJarPathFromPath(dexOutputFile)
|
||||
|
||||
// Dexpreopting
|
||||
j.dexpreopt(ctx, dexOutputFile)
|
||||
j.dexpreopt(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), dexOutputFile)
|
||||
|
||||
outputFile = dexOutputFile
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ type DexpreopterInterface interface {
|
|||
IsInstallable() bool
|
||||
|
||||
// True if dexpreopt is disabled for the java module.
|
||||
dexpreoptDisabled(ctx android.BaseModuleContext) bool
|
||||
dexpreoptDisabled(ctx android.BaseModuleContext, libraryName string) bool
|
||||
|
||||
// If the java module is to be installed into an APEX, this list contains information about the
|
||||
// dexpreopt outputs to be installed on devices. Note that these dexpreopt outputs are installed
|
||||
|
|
@ -182,15 +182,9 @@ func forPrebuiltApex(ctx android.BaseModuleContext) bool {
|
|||
return apexInfo.ForPrebuiltApex
|
||||
}
|
||||
|
||||
func moduleName(ctx android.BaseModuleContext) string {
|
||||
// Remove the "prebuilt_" prefix if the module is from a prebuilt because the prefix is not
|
||||
// expected by dexpreopter.
|
||||
return android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName())
|
||||
}
|
||||
|
||||
// Returns whether dexpreopt is applicable to the module.
|
||||
// When it returns true, neither profile nor dexpreopt artifacts will be generated.
|
||||
func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool {
|
||||
func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext, libName string) bool {
|
||||
if !ctx.Device() {
|
||||
return true
|
||||
}
|
||||
|
|
@ -213,11 +207,20 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool {
|
|||
return true
|
||||
}
|
||||
|
||||
if _, isApex := android.ModuleProvider(ctx, android.ApexBundleInfoProvider); isApex {
|
||||
// dexpreopt rules for system server jars can be generated in the ModuleCtx of prebuilt apexes
|
||||
return false
|
||||
}
|
||||
|
||||
global := dexpreopt.GetGlobalConfig(ctx)
|
||||
|
||||
isApexSystemServerJar := global.AllApexSystemServerJars(ctx).ContainsJar(moduleName(ctx))
|
||||
if isApexVariant(ctx) {
|
||||
// Don't preopt APEX variant module unless the module is an APEX system server jar.
|
||||
// Use the libName argument to determine if the library being dexpreopt'd is a system server jar
|
||||
// ctx.ModuleName() is not safe. In case of prebuilt apexes, the dexpreopt rules of system server jars
|
||||
// are created in the ctx object of the top-level prebuilt apex.
|
||||
isApexSystemServerJar := global.AllApexSystemServerJars(ctx).ContainsJar(libName)
|
||||
|
||||
if _, isApex := android.ModuleProvider(ctx, android.ApexBundleInfoProvider); isApex || isApexVariant(ctx) {
|
||||
// dexpreopt rules for system server jars can be generated in the ModuleCtx of prebuilt apexes
|
||||
if !isApexSystemServerJar {
|
||||
return true
|
||||
}
|
||||
|
|
@ -234,14 +237,20 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool {
|
|||
}
|
||||
|
||||
func dexpreoptToolDepsMutator(ctx android.BottomUpMutatorContext) {
|
||||
if d, ok := ctx.Module().(DexpreopterInterface); !ok || d.dexpreoptDisabled(ctx) || !dexpreopt.IsDex2oatNeeded(ctx) {
|
||||
if _, isApex := android.ModuleProvider(ctx, android.ApexBundleInfoProvider); isApex && dexpreopt.IsDex2oatNeeded(ctx) {
|
||||
// prebuilt apexes can genererate rules to dexpreopt deapexed jars
|
||||
// Add a dex2oat dep aggressively on _every_ apex module
|
||||
dexpreopt.RegisterToolDeps(ctx)
|
||||
return
|
||||
}
|
||||
if d, ok := ctx.Module().(DexpreopterInterface); !ok || d.dexpreoptDisabled(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName())) || !dexpreopt.IsDex2oatNeeded(ctx) {
|
||||
return
|
||||
}
|
||||
dexpreopt.RegisterToolDeps(ctx)
|
||||
}
|
||||
|
||||
func (d *dexpreopter) odexOnSystemOther(ctx android.ModuleContext, installPath android.InstallPath) bool {
|
||||
return dexpreopt.OdexOnSystemOtherByName(moduleName(ctx), android.InstallPathToOnDevicePath(ctx, installPath), dexpreopt.GetGlobalConfig(ctx))
|
||||
func (d *dexpreopter) odexOnSystemOther(ctx android.ModuleContext, libName string, installPath android.InstallPath) bool {
|
||||
return dexpreopt.OdexOnSystemOtherByName(libName, android.InstallPathToOnDevicePath(ctx, installPath), dexpreopt.GetGlobalConfig(ctx))
|
||||
}
|
||||
|
||||
// Returns the install path of the dex jar of a module.
|
||||
|
|
@ -252,13 +261,13 @@ func (d *dexpreopter) odexOnSystemOther(ctx android.ModuleContext, installPath a
|
|||
// This function is on a best-effort basis. It cannot handle the case where an APEX jar is not a
|
||||
// system server jar, which is fine because we currently only preopt system server jars for APEXes.
|
||||
func (d *dexpreopter) getInstallPath(
|
||||
ctx android.ModuleContext, defaultInstallPath android.InstallPath) android.InstallPath {
|
||||
ctx android.ModuleContext, libName string, defaultInstallPath android.InstallPath) android.InstallPath {
|
||||
global := dexpreopt.GetGlobalConfig(ctx)
|
||||
if global.AllApexSystemServerJars(ctx).ContainsJar(moduleName(ctx)) {
|
||||
dexLocation := dexpreopt.GetSystemServerDexLocation(ctx, global, moduleName(ctx))
|
||||
if global.AllApexSystemServerJars(ctx).ContainsJar(libName) {
|
||||
dexLocation := dexpreopt.GetSystemServerDexLocation(ctx, global, libName)
|
||||
return android.PathForModuleInPartitionInstall(ctx, "", strings.TrimPrefix(dexLocation, "/"))
|
||||
}
|
||||
if !d.dexpreoptDisabled(ctx) && isApexVariant(ctx) &&
|
||||
if !d.dexpreoptDisabled(ctx, libName) && isApexVariant(ctx) &&
|
||||
filepath.Base(defaultInstallPath.PartitionDir()) != "apex" {
|
||||
ctx.ModuleErrorf("unable to get the install path of the dex jar for dexpreopt")
|
||||
}
|
||||
|
|
@ -273,10 +282,10 @@ func (d *Dexpreopter) DexpreoptPrebuiltApexSystemServerJars(ctx android.ModuleCo
|
|||
d.installPath = android.PathForModuleInPartitionInstall(ctx, "", strings.TrimPrefix(dexpreopt.GetSystemServerDexLocation(ctx, dc, libraryName), "/"))
|
||||
// generate the rules for creating the .odex and .vdex files for this system server jar
|
||||
dexJarFile := di.PrebuiltExportPath(ApexRootRelativePathToJavaLib(libraryName))
|
||||
d.dexpreopt(ctx, dexJarFile)
|
||||
d.dexpreopt(ctx, libraryName, dexJarFile)
|
||||
}
|
||||
|
||||
func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.WritablePath) {
|
||||
func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, libName string, dexJarFile android.WritablePath) {
|
||||
global := dexpreopt.GetGlobalConfig(ctx)
|
||||
|
||||
// TODO(b/148690468): The check on d.installPath is to bail out in cases where
|
||||
|
|
@ -289,7 +298,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
|
||||
dexLocation := android.InstallPathToOnDevicePath(ctx, d.installPath)
|
||||
|
||||
providesUsesLib := moduleName(ctx)
|
||||
providesUsesLib := libName
|
||||
if ulib, ok := ctx.Module().(ProvidesUsesLib); ok {
|
||||
name := ulib.ProvidesUsesLib()
|
||||
if name != nil {
|
||||
|
|
@ -299,11 +308,11 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
|
||||
// If it is test, make config files regardless of its dexpreopt setting.
|
||||
// The config files are required for apps defined in make which depend on the lib.
|
||||
if d.isTest && d.dexpreoptDisabled(ctx) {
|
||||
if d.isTest && d.dexpreoptDisabled(ctx, libName) {
|
||||
return
|
||||
}
|
||||
|
||||
isSystemServerJar := global.AllSystemServerJars(ctx).ContainsJar(moduleName(ctx))
|
||||
isSystemServerJar := global.AllSystemServerJars(ctx).ContainsJar(libName)
|
||||
|
||||
bootImage := defaultBootImageConfig(ctx)
|
||||
// When `global.PreoptWithUpdatableBcp` is true, `bcpForDexpreopt` below includes the mainline
|
||||
|
|
@ -322,7 +331,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
targets = append(targets, target)
|
||||
}
|
||||
}
|
||||
if isSystemServerJar && moduleName(ctx) != "com.android.location.provider" {
|
||||
if isSystemServerJar && libName != "com.android.location.provider" {
|
||||
// If the module is a system server jar, only preopt for the primary arch because the jar can
|
||||
// only be loaded by system server. "com.android.location.provider" is a special case because
|
||||
// it's also used by apps as a shared library.
|
||||
|
|
@ -358,7 +367,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
profileIsTextListing = true
|
||||
} else if global.ProfileDir != "" {
|
||||
profileClassListing = android.ExistentPathForSource(ctx,
|
||||
global.ProfileDir, moduleName(ctx)+".prof")
|
||||
global.ProfileDir, libName+".prof")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -370,9 +379,9 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
|
||||
// Full dexpreopt config, used to create dexpreopt build rules.
|
||||
dexpreoptConfig := &dexpreopt.ModuleConfig{
|
||||
Name: moduleName(ctx),
|
||||
Name: libName,
|
||||
DexLocation: dexLocation,
|
||||
BuildPath: android.PathForModuleOut(ctx, "dexpreopt", dexJarStem, moduleName(ctx)+".jar").OutputPath,
|
||||
BuildPath: android.PathForModuleOut(ctx, "dexpreopt", dexJarStem, libName+".jar").OutputPath,
|
||||
DexPath: dexJarFile,
|
||||
ManifestPath: android.OptionalPathForPath(d.manifestFile),
|
||||
UncompressedDex: d.uncompressedDex,
|
||||
|
|
@ -405,7 +414,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
d.configPath = android.PathForModuleOut(ctx, "dexpreopt", dexJarStem, "dexpreopt.config")
|
||||
dexpreopt.WriteModuleConfig(ctx, dexpreoptConfig, d.configPath)
|
||||
|
||||
if d.dexpreoptDisabled(ctx) {
|
||||
if d.dexpreoptDisabled(ctx, libName) {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -476,7 +485,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
|
|||
// The installs will be handled by Make as sub-modules of the java library.
|
||||
d.builtInstalledForApex = append(d.builtInstalledForApex, dexpreopterInstall{
|
||||
name: arch + "-" + installBase,
|
||||
moduleName: dexJarStem,
|
||||
moduleName: libName,
|
||||
outputPathOnHost: install.From,
|
||||
installDirOnDevice: installPath,
|
||||
installFileOnDevice: installBase,
|
||||
|
|
|
|||
20
java/java.go
20
java/java.go
|
|
@ -653,7 +653,7 @@ func (j *Library) PermittedPackagesForUpdatableBootJars() []string {
|
|||
return j.properties.Permitted_packages
|
||||
}
|
||||
|
||||
func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool {
|
||||
func shouldUncompressDex(ctx android.ModuleContext, libName string, dexpreopter *dexpreopter) bool {
|
||||
// Store uncompressed (and aligned) any dex files from jars in APEXes.
|
||||
if apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider); !apexInfo.IsForPlatform() {
|
||||
return true
|
||||
|
|
@ -665,7 +665,7 @@ func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bo
|
|||
}
|
||||
|
||||
// Store uncompressed dex files that are preopted on /system.
|
||||
if !dexpreopter.dexpreoptDisabled(ctx) && (ctx.Host() || !dexpreopter.odexOnSystemOther(ctx, dexpreopter.installPath)) {
|
||||
if !dexpreopter.dexpreoptDisabled(ctx, libName) && (ctx.Host() || !dexpreopter.odexOnSystemOther(ctx, libName, dexpreopter.installPath)) {
|
||||
return true
|
||||
}
|
||||
if ctx.Config().UncompressPrivAppDex() &&
|
||||
|
|
@ -680,7 +680,7 @@ func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bo
|
|||
func setUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter, dexer *dexer) {
|
||||
if dexer.dexProperties.Uncompress_dex == nil {
|
||||
// If the value was not force-set by the user, use reasonable default based on the module.
|
||||
dexer.dexProperties.Uncompress_dex = proptools.BoolPtr(shouldUncompressDex(ctx, dexpreopter))
|
||||
dexer.dexProperties.Uncompress_dex = proptools.BoolPtr(shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), dexpreopter))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -712,7 +712,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
j.checkHeadersOnly(ctx)
|
||||
if ctx.Device() {
|
||||
j.dexpreopter.installPath = j.dexpreopter.getInstallPath(
|
||||
ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar"))
|
||||
ctx, j.Name(), android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar"))
|
||||
j.dexpreopter.isSDKLibrary = j.deviceProperties.IsSDKLibrary
|
||||
setUncompressDex(ctx, &j.dexpreopter, &j.dexer)
|
||||
j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex
|
||||
|
|
@ -2274,7 +2274,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
installPath := android.PathForModuleInPartitionInstall(ctx, "apex", ai.ApexVariationName, ApexRootRelativePathToJavaLib(j.BaseModuleName()))
|
||||
j.dexJarInstallFile = installPath
|
||||
|
||||
j.dexpreopter.installPath = j.dexpreopter.getInstallPath(ctx, installPath)
|
||||
j.dexpreopter.installPath = j.dexpreopter.getInstallPath(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), installPath)
|
||||
setUncompressDex(ctx, &j.dexpreopter, &j.dexer)
|
||||
j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex
|
||||
|
||||
|
|
@ -2282,8 +2282,6 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
j.dexpreopter.inputProfilePathOnHost = profilePath
|
||||
}
|
||||
|
||||
j.dexpreopt(ctx, dexOutputPath)
|
||||
|
||||
// Initialize the hiddenapi structure.
|
||||
j.initHiddenAPI(ctx, dexJarFile, outputFile, j.dexProperties.Uncompress_dex)
|
||||
} else {
|
||||
|
|
@ -2304,7 +2302,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
// Dex compilation
|
||||
|
||||
j.dexpreopter.installPath = j.dexpreopter.getInstallPath(
|
||||
ctx, android.PathForModuleInstall(ctx, "framework", jarName))
|
||||
ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), android.PathForModuleInstall(ctx, "framework", jarName))
|
||||
setUncompressDex(ctx, &j.dexpreopter, &j.dexer)
|
||||
j.dexpreopter.uncompressedDex = *j.dexProperties.Uncompress_dex
|
||||
|
||||
|
|
@ -2592,8 +2590,8 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
}
|
||||
|
||||
j.dexpreopter.installPath = j.dexpreopter.getInstallPath(
|
||||
ctx, android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar"))
|
||||
j.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, &j.dexpreopter)
|
||||
ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), android.PathForModuleInstall(ctx, "framework", j.Stem()+".jar"))
|
||||
j.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), &j.dexpreopter)
|
||||
|
||||
inputJar := ctx.ExpandSource(j.properties.Jars[0], "jars")
|
||||
dexOutputFile := android.PathForModuleOut(ctx, ctx.ModuleName()+".jar")
|
||||
|
|
@ -2632,7 +2630,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||
|
||||
j.dexJarFile = makeDexJarPathFromPath(dexOutputFile)
|
||||
|
||||
j.dexpreopt(ctx, dexOutputFile)
|
||||
j.dexpreopt(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), dexOutputFile)
|
||||
|
||||
if apexInfo.IsForPlatform() {
|
||||
ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
|
||||
|
|
|
|||
|
|
@ -2879,16 +2879,13 @@ func (module *SdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleCo
|
|||
module.installFile = installPath
|
||||
module.initHiddenAPI(ctx, dexJarFile, module.findScopePaths(apiScopePublic).stubsImplPath[0], nil)
|
||||
|
||||
module.dexpreopter.installPath = module.dexpreopter.getInstallPath(ctx, installPath)
|
||||
module.dexpreopter.installPath = module.dexpreopter.getInstallPath(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), installPath)
|
||||
module.dexpreopter.isSDKLibrary = true
|
||||
module.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, &module.dexpreopter)
|
||||
module.dexpreopter.uncompressedDex = shouldUncompressDex(ctx, android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName()), &module.dexpreopter)
|
||||
|
||||
if profilePath := di.PrebuiltExportPath(dexJarFileApexRootRelative + ".prof"); profilePath != nil {
|
||||
module.dexpreopter.inputProfilePathOnHost = profilePath
|
||||
}
|
||||
|
||||
// Dexpreopting.
|
||||
module.dexpreopt(ctx, dexOutputPath)
|
||||
} else {
|
||||
// This should never happen as a variant for a prebuilt_apex is only created if the
|
||||
// prebuilt_apex has been configured to export the java library dex file.
|
||||
|
|
|
|||
Loading…
Reference in a new issue