diff options
| -rw-r--r-- | dexpreopt/dexpreopt.go | 3 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 5 |
2 files changed, 6 insertions, 2 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. diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 27027f07d..313d8c7a4 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -554,7 +554,10 @@ func addDependenciesOntoSelectedBootImageApexes(ctx android.BottomUpMutatorConte typ: dexpreoptBootJar, } - ctx.AddFarVariationDependencies(ctx.Target().Variations(), tag, android.RemoveOptionalPrebuiltPrefix(selected)) + dep := android.RemoveOptionalPrebuiltPrefix(selected) + if ctx.OtherModuleDependencyVariantExists(ctx.Target().Variations(), dep) { + ctx.AddFarVariationDependencies(ctx.Target().Variations(), tag, dep) + } } } } |