From 514848766ccb565c9179bf4aaa231a20f6e74c37 Mon Sep 17 00:00:00 2001
From: Satish Yalla <satishy@google.com>
Date: Thu, 20 Mar 2025 21:57:26 -0700
Subject: Revert "Make d8-on-eng a per-module opt-out"

Revert submission 3555366-eng-d8

Reason for revert: Droidmonitor created revert due to b/405397520. Will be verified through ABTD for standard investigation.

Reverted changes: /q/submissionid:3555366-eng-d8

Change-Id: Idc27a646af8e726e74665fbbb80f6fc3e510625a
---
 java/dex.go | 8 +-------
 1 file changed, 1 insertion(+), 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 {
-- 
cgit v1.2.3-59-g8ed1b