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

Merge "Use uncompressed dex for all preopted system targets" into main am: fd3921f6bb am: 70d0d2d7aa

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

Change-Id: I76f277e8446796dcd1f713105477a43221d35aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-03-12 03:15:55 +00:00
committed by Automerger Merge Worker
parent 556f4c12cc 70d0d2d7aa
commit 21a3203cbf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -680,10 +680,11 @@ func shouldUncompressDex(ctx android.ModuleContext, libName string, dexpreopter
return true return true
} }
// Store uncompressed dex files that are preopted on /system. // Store uncompressed dex files that are preopted on /system or /system_other.
if !dexpreopter.dexpreoptDisabled(ctx, libName) && (ctx.Host() || !dexpreopter.odexOnSystemOther(ctx, libName, dexpreopter.installPath)) { if !dexpreopter.dexpreoptDisabled(ctx, libName) {
return true return true
} }
if ctx.Config().UncompressPrivAppDex() && if ctx.Config().UncompressPrivAppDex() &&
inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules()) { inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules()) {
return true return true