Merge "Don't load compiler_rt if renderscript is disabled" am: a59180a4ca am: aefc071450 am: 18ef8977d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2488716 Change-Id: Ia08281757380920a99c5f48a6da3849e7af7b975 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
07e4e1b932
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user