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

Commit f75c06b0 authored by Prashanth Swaminathan's avatar Prashanth Swaminathan Committed by Automerger Merge Worker
Browse files

Merge "Don't load compiler_rt if renderscript is disabled" am: a59180a4 am:... 

Merge "Don't load compiler_rt if renderscript is disabled" am: a59180a4 am: aefc0714 am: 18ef8977 am: 07e4e1b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2488716



Change-Id: Ia91ca26cccef6a99cbe6d57951aad381f89d4fd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 008dc4a4 07e4e1b9

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

+6 −1
Original line number Diff line number Diff line
@@ -185,8 +185,13 @@ public class ZygoteInit { 
    private static void preloadSharedLibraries() {

        Log.i(TAG, "Preloading shared libraries...");

        System.loadLibrary("android");

        System.loadLibrary("compiler_rt");

        System.loadLibrary("jnigraphics");



        // TODO(b/206676167): This library is only used for renderscript today. When renderscript is

        // removed, this load can be removed as well.

        if (!SystemProperties.getBoolean("config.disable_renderscript", false)) {

            System.loadLibrary("compiler_rt");

        }

    }



    native private static void nativePreloadAppProcessHALs();