diff options
| author | 2024-03-12 01:43:32 +0000 | |
|---|---|---|
| committer | 2024-03-12 01:43:32 +0000 | |
| commit | fd3921f6bb9e7576a359a348868ee86fbb2c20cc (patch) | |
| tree | a1ef21c218193bc4c320f841a15c74426fd28ff1 /java/java.go | |
| parent | d69b79e29599e83e3a589512e2db2a2b341f75a5 (diff) | |
| parent | a561efb13ced9ac41b571a48203f078b918aaee0 (diff) | |
Merge "Use uncompressed dex for all preopted system targets" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 794020dc5..6423eebff 100644 --- a/java/java.go +++ b/java/java.go @@ -680,10 +680,11 @@ func shouldUncompressDex(ctx android.ModuleContext, libName string, dexpreopter return true } - // Store uncompressed dex files that are preopted on /system. - if !dexpreopter.dexpreoptDisabled(ctx, libName) && (ctx.Host() || !dexpreopter.odexOnSystemOther(ctx, libName, dexpreopter.installPath)) { + // Store uncompressed dex files that are preopted on /system or /system_other. + if !dexpreopter.dexpreoptDisabled(ctx, libName) { return true } + if ctx.Config().UncompressPrivAppDex() && inList(ctx.ModuleName(), ctx.Config().ModulesLoadedByPrivilegedModules()) { return true |