From b97f1d1b6b790619514395126527f3639e16fe6f Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Tue, 18 Mar 2025 15:18:58 -0700 Subject: Use d8 when on eng builds This is consistent with all of the other ways that eng builds are faster, but do not match the expected performance of user or userdebug builds. We still use r8 if a module has `optimize: { enabled: true,}`. Bug: b/374975543 Test: manual, TH Change-Id: I28c6de4472f4df1f791758294d45b67acc0a7b7c --- java/java.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index dd9f852f0..07e38a17e 100644 --- a/java/java.go +++ b/java/java.go @@ -670,12 +670,12 @@ func sdkDeps(ctx android.BottomUpMutatorContext, sdkContext android.SdkContext, ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.bootclasspath...) ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...) ctx.AddVariationDependencies(nil, sdkLibTag, sdkDep.classpath...) - if d.effectiveOptimizeEnabled() && sdkDep.hasStandardLibs() { + if d.effectiveOptimizeEnabled(ctx) && sdkDep.hasStandardLibs() { ctx.AddVariationDependencies(nil, proguardRaiseTag, config.LegacyCorePlatformBootclasspathLibraries..., ) } - if d.effectiveOptimizeEnabled() && sdkDep.hasFrameworkLibs() { + if d.effectiveOptimizeEnabled(ctx) && sdkDep.hasFrameworkLibs() { ctx.AddVariationDependencies(nil, proguardRaiseTag, config.FrameworkLibraries...) } } -- cgit v1.2.3-59-g8ed1b