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

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

Change-Id: Iee25d414d3cf98cda32a10a9a4c7e218f0e52cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Prashanth Swaminathan
2023-03-15 22:38:26 +00:00
committed by Automerger Merge Worker

View File

@@ -185,8 +185,13 @@ public class ZygoteInit {
private static void preloadSharedLibraries() { private static void preloadSharedLibraries() {
Log.i(TAG, "Preloading shared libraries..."); Log.i(TAG, "Preloading shared libraries...");
System.loadLibrary("android"); System.loadLibrary("android");
System.loadLibrary("compiler_rt");
System.loadLibrary("jnigraphics"); 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(); native private static void nativePreloadAppProcessHALs();