From 1c5c060b6ccb35e0502c78e7eb32291f06186454 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 14 Jun 2019 14:11:47 -0700 Subject: Zygote: do not preload Vulkan driver in Q This is a partial revert of http://ag/7064585 to be safe for Q. 1. skia is not going to use Vulkan backend in Q. 2. usap is no longer preloading graphics drivers. 3. Most importantly, Vulkan loader is not quite ready to be preloaded in Zygote. Because the layers discovering mechanism currently only happens once with the driver loading. By preloading in Zygote, apps won't be able to use the layers shipped with the debug apk. Bug: 135281983 Test: build, flash and boot. Change-Id: I88b0ad60ab8233714253a92166da76dc992f7f98 --- core/jni/com_android_internal_os_ZygoteInit.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/jni/com_android_internal_os_ZygoteInit.cpp b/core/jni/com_android_internal_os_ZygoteInit.cpp index 5cca0fdc735b..c2a5ee43dbd5 100644 --- a/core/jni/com_android_internal_os_ZygoteInit.cpp +++ b/core/jni/com_android_internal_os_ZygoteInit.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include "core_jni_helpers.h" @@ -67,9 +66,6 @@ void android_internal_os_ZygoteInit_nativePreloadGraphicsDriver(JNIEnv* env, jcl ScopedSCSExit x; if (Properties::peekRenderPipelineType() == RenderPipelineType::SkiaGL) { eglGetDisplay(EGL_DEFAULT_DISPLAY); - } else { - uint32_t count = 0; - vkEnumerateInstanceExtensionProperties(nullptr, &count, nullptr); } } -- cgit v1.2.3-59-g8ed1b