summaryrefslogtreecommitdiff
path: root/java/base.go
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-19 15:45:46 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-19 15:45:46 -0700
commit870234dd444240b11d2b131a19eefe41fdf84d54 (patch)
tree7f049887be6aaa6e158f87dea5e89a1bc0eada65 /java/base.go
parentdd5b6865f1ae4015193f86b1816d5e7f1e714788 (diff)
parentf6f98f8edb1573e7842277a540fce54d18d242c9 (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/base.go')
-rw-r--r--java/base.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/base.go b/java/base.go
index 1a12075bc..8aa0109d0 100644
--- a/java/base.go
+++ b/java/base.go
@@ -1816,7 +1816,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath
classesJar: outputFile,
jarName: jarName,
}
- if j.GetProfileGuided(ctx) && j.optimizeOrObfuscateEnabled() && !j.EnableProfileRewriting(ctx) {
+ if j.GetProfileGuided(ctx) && j.optimizeOrObfuscateEnabled(ctx) && !j.EnableProfileRewriting(ctx) {
ctx.PropertyErrorf("enable_profile_rewriting",
"Enable_profile_rewriting must be true when profile_guided dexpreopt and R8 optimization/obfuscation is turned on. The attached profile should be sourced from an unoptimized/unobfuscated APK.",
)