diff options
| author | 2025-03-20 19:16:56 -0700 | |
|---|---|---|
| committer | 2025-03-20 19:16:56 -0700 | |
| commit | 25df561cc73a68847b4ede8664a05fe60847d31e (patch) | |
| tree | 85efea2fb22683f01399dcaa409de39ff669dc60 | |
| parent | e9db69df84e00afcbc63d93a67d42161cf6306aa (diff) | |
| parent | 6cf30e3595271a02c70cc5d76fdb4c0c2ff15997 (diff) | |
Merge "Make d8-on-eng a per-module opt-out" into main am: 6cf30e3595
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3555644
Change-Id: I1e4a4b0e8588c3b4d0084b3ab87bfebd4e8149e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | java/dex.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/dex.go b/java/dex.go index dd6467546..f2406fb3c 100644 --- a/java/dex.go +++ b/java/dex.go @@ -42,6 +42,9 @@ type DexProperties struct { // True if the module containing this has it set by default. EnabledByDefault bool `blueprint:"mutated"` + // If true, then this module will be optimized on eng builds. + Enabled_on_eng *bool + // Whether to allow that library classes inherit from program classes. // Defaults to false. Ignore_library_extends_program *bool @@ -162,7 +165,10 @@ type dexer struct { } func (d *dexer) effectiveOptimizeEnabled(ctx android.EarlyModuleContext) bool { - return BoolDefault(d.dexProperties.Optimize.Enabled, d.dexProperties.Optimize.EnabledByDefault && !ctx.Config().Eng()) + if ctx.Config().Eng() { + return proptools.Bool(d.dexProperties.Optimize.Enabled_on_eng) + } + return BoolDefault(d.dexProperties.Optimize.Enabled, d.dexProperties.Optimize.EnabledByDefault) } func (d *DexProperties) resourceShrinkingEnabled(ctx android.ModuleContext) bool { |