Revert "Generate app profiles even if dexpreopt is disabled."
Revert submission 2574032 Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_riscv64_minidroid-userdebug&lkgb=10069333&lkbb=10075041&fkbb=10071083>, bug <b/280902279> Reverted changes: /q/submissionid:2574032 Change-Id: Ia9d05f3b7439604eb4a4b4100f46879fe11f5820 BUG: <280902279>
This commit is contained in:
committed by
Gerrit Code Review
parent
7b845e808f
commit
3d08c388b9
@@ -100,19 +100,11 @@ func GenerateDexpreoptRule(ctx android.BuilderContext, globalSoong *GlobalSoongC
|
||||
return rule, nil
|
||||
}
|
||||
|
||||
// If dexpreopt is applicable to the module, returns whether dexpreopt is disabled. Otherwise, the
|
||||
// behavior is undefined.
|
||||
// When it returns true, dexpreopt artifacts will not be generated, but profile will still be
|
||||
// generated if profile-guided compilation is requested.
|
||||
func dexpreoptDisabled(ctx android.PathContext, global *GlobalConfig, module *ModuleConfig) bool {
|
||||
if ctx.Config().UnbundledBuild() {
|
||||
return true
|
||||
}
|
||||
|
||||
if global.DisablePreopt {
|
||||
return true
|
||||
}
|
||||
|
||||
if contains(global.DisablePreoptModules, module.Name) {
|
||||
return true
|
||||
}
|
||||
|
@@ -181,10 +181,3 @@ func FixtureDisableDexpreoptBootImages(disable bool) android.FixturePreparer {
|
||||
dexpreoptConfig.DisablePreoptBootImages = disable
|
||||
})
|
||||
}
|
||||
|
||||
// FixtureDisableDexpreopt sets the DisablePreopt property in the global config.
|
||||
func FixtureDisableDexpreopt(disable bool) android.FixturePreparer {
|
||||
return FixtureModifyGlobalConfig(func(_ android.PathContext, dexpreoptConfig *GlobalConfig) {
|
||||
dexpreoptConfig.DisablePreopt = disable
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user