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

Commit 989618a4 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Android (Google) Code Review
Browse files

Merge "Adjust forced dexopt in case of stripped APKs." into oc-dev

parents ba81bc9f 8a5845e6
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -634,9 +634,13 @@ public class PackageDexOptimizer {

        @Override
        protected int adjustDexoptNeeded(int dexoptNeeded) {
            // Ensure compilation, no matter the current state.
            // TODO: The return value is wrong when patchoat is needed.
            return DexFile.DEX2OAT_FROM_SCRATCH;
            if (dexoptNeeded == DexFile.NO_DEXOPT_NEEDED) {
                // Ensure compilation by pretending a compiler filter change on the
                // apk/odex location (the reason for the '-'. A positive value means
                // the 'oat' location).
                return -DexFile.DEX2OAT_FOR_FILTER;
            }
            return dexoptNeeded;
        }

        @Override