summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-06-15 00:02:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-06-15 00:02:36 +0000
commitd90f23c620c5f403784a1d39aa0140df4f7fddbc (patch)
tree7d200395d3b24ffc2f931e0e1ce886e09fca8ad2
parenta9ab8516cafb45f8e13631b3b37ef38e5b55bf16 (diff)
parent1c5c060b6ccb35e0502c78e7eb32291f06186454 (diff)
Merge "Zygote: do not preload Vulkan driver in Q" into qt-dev
-rw-r--r--core/jni/com_android_internal_os_ZygoteInit.cpp4
1 files changed, 0 insertions, 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 <EGL/egl.h>
#include <Properties.h>
#include <ui/GraphicBufferMapper.h>
-#include <vulkan/vulkan.h>
#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);
}
}