diff options
| author | 2025-03-19 14:18:09 -0700 | |
|---|---|---|
| committer | 2025-03-19 14:18:09 -0700 | |
| commit | f6f98f8edb1573e7842277a540fce54d18d242c9 (patch) | |
| tree | 642c0fe6c7f4ddd7310bba7d8a000237ede458d9 /java/java.go | |
| parent | ac2ff00846dead84597a14f929ceea46ddf28fa2 (diff) | |
| parent | b97f1d1b6b790619514395126527f3639e16fe6f (diff) | |
Merge "Use d8 when on eng builds" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
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...) } } |