Merge "Don't load compiler_rt if renderscript is disabled" am: a59180a4ca am: aefc071450
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2488716 Change-Id: I795fea575b3b97f81df13114fc3b75a838867b03 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
18ef8977d0
@@ -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();
|
||||||
|
|||||||
Reference in New Issue
Block a user