summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Priyanka Advani (xWF) <padvani@google.com> 2025-03-24 12:41:35 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-24 12:41:35 -0700
commitecc5156d7e01d109a897d33b98dcf886c69836a3 (patch)
treee813b01566b171074e957c90926c815c19fe7be4
parentb02934f2c013d407bc1f5078e56035352c787664 (diff)
parent09f9e0f678d2ba54b44b26fe70babd75353cb35a (diff)
Merge "Revert "Make d8-on-eng a per-module opt-out"" into main am: 09f9e0f678
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3556063 Change-Id: I6b73df8a0a78e96d48d1f7a3d9e6f6ebac81279e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--java/dex.go8
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 {