StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only dexpreopt system server jars for the primary arch." am: 7d78bad7e2 am: 0a21175f17 am: c97c55b67a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318994

Change-Id: I6962a905278285b88ca19c863fd53cb821fd174e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiakai Zhang
2022-11-29 13:23:56 +00:00
committed by Automerger Merge Worker
parent 832e7d3417 c97c55b67a
commit 32f3de64d8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/dexpreopt.go
View File

@@ -269,8 +269,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
targets = append(targets, target) targets = append(targets, target)
} }
} }
if isSystemServerJar && !d.isSDKLibrary { if isSystemServerJar && moduleName(ctx) != "com.android.location.provider" {
// If the module is not an SDK library and it's a system server jar, only preopt the primary arch. // 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] targets = targets[:1]
} }
} }