commit 9a6f87ebd63af5de2b31ca59aec0f49bfae85622
author satayev <satayev@google.com> Tue May 04 16:14:48 2021 +0100
committer satayev <satayev@google.com> Wed May 05 14:24:02 2021 +0100
tree ff2084ae95468953f11d38c3d826af60c8e4bb68
parent ee4e7fe76fdab6339993d01083fa73c59e24e91b

Make SystemServerJars ConfiguredJarList.

Consistent with plumbing of boot jars. SystemServerJars only support /system/framework/ jars.

Bug: 180105615, 155630745
Test: m && launch_cvd
Change-Id: I58b005b7c4103c8e250090e995b1d9b2f9ed4a76

java/dexpreopt.go

diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index 0020a2d..3113eb3 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -150,7 +150,7 @@
 
 	global := dexpreopt.GetGlobalConfig(ctx)
 
-	isSystemServerJar := inList(ctx.ModuleName(), global.SystemServerJars)
+	isSystemServerJar := global.SystemServerJars.ContainsJar(ctx.ModuleName())
 
 	bootImage := defaultBootImageConfig(ctx)
 	if global.UseArtImage {