summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-18 11:28:33 -0800
committer Colin Cross <ccross@android.com> 2025-02-18 11:31:28 -0800
commit49ac68a6c35324db3b6dc32bc9c145f4550e5bd9 (patch)
treed4c40cd7d28a40e6aed5a57c2a421e2d3c698712
parent8d880a04082fab28769ffc11512bc628b9134372 (diff)
Disable checkSystemServerOrder
checkSystemServerOrder is blocking switching a release branch to prebuilts after I1a92ff461d4706cf68a0b8b37e53dea412efb8bf. The current implementation blindly walks all dependencies, which means it can follow a bootclasspath dependency into an apex and then accidentally examine system server jars in that apex. Disable it for now. Bug: 380084017 Bug: 397461231 Test: builds Change-Id: I4ffe56305b784b9c5498870d4a3b95d9b4984e59
-rw-r--r--dexpreopt/dexpreopt.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go
index e882470ac..1452b412e 100644
--- a/dexpreopt/dexpreopt.go
+++ b/dexpreopt/dexpreopt.go
@@ -284,7 +284,8 @@ func dexpreoptCommand(ctx android.BuilderContext, globalSoong *GlobalSoongConfig
clcTargetString := "PCL[" + strings.Join(clcTarget, ":") + "]"
if systemServerClasspathJars.ContainsJar(module.Name) {
- checkSystemServerOrder(ctx, jarIndex)
+ // TODO(b/397461231): renable this check
+ //checkSystemServerOrder(ctx, jarIndex)
} else {
// Standalone jars are loaded by separate class loaders with SYSTEMSERVERCLASSPATH as the
// parent.