diff options
| author | 2025-03-24 18:26:22 -0700 | |
|---|---|---|
| committer | 2025-03-24 18:26:22 -0700 | |
| commit | fc5e8dc9c38db6628ed1d9172161187da74b066f (patch) | |
| tree | d9f495586f867878d601c34c59eb3c49ec3d5a53 /java/dex.go | |
| parent | 1248ced0cad29018090e65e3762585cdd774e864 (diff) | |
| parent | c2e8b6c102f4b4b44e2568f07d95fc674bbd2ef0 (diff) | |
Snap for 13264465 from c2e8b6c102f4b4b44e2568f07d95fc674bbd2ef0 to 25Q2-release
Change-Id: I6875fd165cc96cc880a3ac7842a516a7b9e70978
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/dex.go b/java/dex.go index f2406fb3c..dd6467546 100644 --- a/java/dex.go +++ b/java/dex.go @@ -42,9 +42,6 @@ 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 @@ -165,10 +162,7 @@ type dexer struct { } func (d *dexer) effectiveOptimizeEnabled(ctx android.EarlyModuleContext) bool { - if ctx.Config().Eng() { - return proptools.Bool(d.dexProperties.Optimize.Enabled_on_eng) - } - return BoolDefault(d.dexProperties.Optimize.Enabled, d.dexProperties.Optimize.EnabledByDefault) + return BoolDefault(d.dexProperties.Optimize.Enabled, d.dexProperties.Optimize.EnabledByDefault && !ctx.Config().Eng()) } func (d *DexProperties) resourceShrinkingEnabled(ctx android.ModuleContext) bool { |