Merge "Set linker namespaces to null if VNDK namespace is not available" into main am: f3166e46ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2918496
Change-Id: I0f787e3693f81b33f676dbad24006a2943559f30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 394a000..50c05f4 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -265,7 +265,8 @@
auto vndkNamespace = android_get_exported_namespace("vndk");
if (!vndkNamespace) {
- return nullptr;
+ mDriverNamespace = nullptr;
+ return mDriverNamespace;
}
mDriverNamespace = android_create_namespace("updatable gfx driver",
@@ -617,7 +618,8 @@
auto vndkNamespace = android_get_exported_namespace("vndk");
if (!vndkNamespace) {
- return nullptr;
+ mAngleNamespace = nullptr;
+ return mAngleNamespace;
}
if (!linkDriverNamespaceLocked(mAngleNamespace, vndkNamespace, "")) {