Merge "Only dexpreopt system server jars for the primary arch." am: 7d78bad7e2
am: 0a21175f17
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318994 Change-Id: I13236a3c8f7f23fee672cdfa8f58cc23d9e8f082 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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]
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user