diff options
| author | 2025-03-19 15:45:46 -0700 | |
|---|---|---|
| committer | 2025-03-19 15:45:46 -0700 | |
| commit | 870234dd444240b11d2b131a19eefe41fdf84d54 (patch) | |
| tree | 7f049887be6aaa6e158f87dea5e89a1bc0eada65 /java/java.go | |
| parent | dd5b6865f1ae4015193f86b1816d5e7f1e714788 (diff) | |
| parent | f6f98f8edb1573e7842277a540fce54d18d242c9 (diff) | |
Merge "Use d8 when on eng builds" into main am: f6f98f8edb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3550619
Change-Id: Ifa0552d9900de34677672adf41e7880345f5a474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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...) } } |