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

Commit 4cae6f7f authored by Calin Juravle's avatar Calin Juravle
Browse files

Pass system server class loader context when asking GetDexOptNeeded 

Test: reboot and check system server jars are not dexopted
Bug: 147208643
Change-Id: I6a612d04b08be23984b04e71e1c8938025d5e4ea
parent 805865c3

core/java/com/android/internal/os/ZygoteInit.java

+6 −7
Original line number Diff line number Diff line
@@ -647,17 +647,18 @@ public class ZygoteInit { 
        String classPathForElement = "";

        boolean compiledSomething = false;

        for (String classPathElement : classPathElements) {

            // System server is fully AOTed and never profiled

            // for profile guided compilation.

            // We default to the verify filter because the compilation will happen on /data and

            // system server cannot load executable code outside /system.

            String systemServerFilter = SystemProperties.get(

                    "dalvik.vm.systemservercompilerfilter", "speed");

                    "dalvik.vm.systemservercompilerfilter", "verify");



            String classLoaderContext =

                        getSystemServerClassLoaderContext(classPathForElement);

            int dexoptNeeded;

            try {

                dexoptNeeded = DexFile.getDexOptNeeded(

                        classPathElement, instructionSet, systemServerFilter,

                        null /* classLoaderContext */, false /* newProfile */,

                        false /* downgrade */);

                        classLoaderContext, false /* newProfile */, false /* downgrade */);

            } catch (FileNotFoundException ignored) {

                // Do not add to the classpath.

                Log.w(TAG, "Missing classpath element for system server: " + classPathElement);
@@ -678,8 +679,6 @@ public class ZygoteInit { 
                final String compilerFilter = systemServerFilter;

                final String uuid = StorageManager.UUID_PRIVATE_INTERNAL;

                final String seInfo = null;

                final String classLoaderContext =

                        getSystemServerClassLoaderContext(classPathForElement);

                final int targetSdkVersion = 0;  // SystemServer targets the system's SDK version

                try {

                    installd.dexopt(classPathElement, Process.SYSTEM_UID, packageName,