diff options
| author | Qiao Yang <qiaoccolato@google.com> | 2023-05-05 15:03:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-05 15:03:24 +0000 |
| commit | 3d08c388b9e00cf98510cbd1408b5ffc3524e2ff (patch) | |
| tree | dea5843baa19eff63513a2e2b04c628c1ad0bf87 /dexpreopt | |
| parent | 7b845e808f07a607a9ecf630eea00a334636f0c5 (diff) | |
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>
Diffstat (limited to 'dexpreopt')
| -rw-r--r-- | dexpreopt/dexpreopt.go | 8 | ||||
| -rw-r--r-- | dexpreopt/testing.go | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index 2b38793ff..a590c72a5 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -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 } diff --git a/dexpreopt/testing.go b/dexpreopt/testing.go index 6ed0736f7..b3dd3cca2 100644 --- a/dexpreopt/testing.go +++ b/dexpreopt/testing.go @@ -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 - }) -} |