Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fbc355f authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

Only dexpreopt system server jars for the primary arch. 

This change stops the build system from dexpreopting system server jars
for the secondary arch. System server jars are only loaded by the system
server, so the artifacts for the the secondary arch are not used.

Bug: 260577273
Test: Build a system image and no longer see artifacts for the
  secondary arch.
Change-Id: I0b131a02e996ed50e7aec3bb0a221f8ceed9ce57
parent 9fd9129b

java/dexpreopt.go

+4 −2
Original line number Diff line number Diff line
@@ -269,8 +269,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr 
				targets = append(targets, target)

			}

		}

		if isSystemServerJar && !d.isSDKLibrary {

			// If the module is not an SDK library and it's a system server jar, only preopt the primary arch.

		if isSystemServerJar && moduleName(ctx) != "com.android.location.provider" {

			// If the module is a system server jar, only preopt for the primary arch because the jar can

			// only be loaded by system server. "com.android.location.provider" is a special case because

			// it's also used by apps as a shared library.

			targets = targets[:1]

		}

	}