Update ANGLE namespace creation
Stop using a lambda function to create the namespace,
since not all C++11 features appear to be working.
This allows the Android emulator to support ANGLE.
Bug: 80239516
Test: atest CtsAngleIntegrationHostTestCases (on emulator)
Test: atest CtsAngleIntegrationHostTestCases (on real device)
Change-Id: Ibb8066fedff8935b4c0c18e73412315fc99a4174
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index aa2f394..b8c6cfe 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -30,7 +30,6 @@
#include <sys/prctl.h>
#include <memory>
-#include <mutex>
#include <string>
#include <dlfcn.h>
@@ -406,19 +405,26 @@
}
android_namespace_t* GraphicsEnv::getAngleNamespace() {
- static std::once_flag once;
- std::call_once(once, [this]() {
- if (mAnglePath.empty()) return;
+ std::lock_guard<std::mutex> lock(mNamespaceMutex);
- mAngleNamespace = android_create_namespace("ANGLE",
- nullptr, // ld_library_path
- mAnglePath.c_str(), // default_library_path
- ANDROID_NAMESPACE_TYPE_SHARED |
- ANDROID_NAMESPACE_TYPE_ISOLATED,
- nullptr, // permitted_when_isolated_path
- nullptr);
- if (!mAngleNamespace) ALOGD("Could not create ANGLE namespace from default");
- });
+ if (mAngleNamespace) {
+ return mAngleNamespace;
+ }
+
+ if (mAnglePath.empty()) {
+ ALOGV("mAnglePath is empty, not creating ANGLE namespace");
+ return nullptr;
+ }
+
+ mAngleNamespace = android_create_namespace("ANGLE",
+ nullptr, // ld_library_path
+ mAnglePath.c_str(), // default_library_path
+ ANDROID_NAMESPACE_TYPE_SHARED |
+ ANDROID_NAMESPACE_TYPE_ISOLATED,
+ nullptr, // permitted_when_isolated_path
+ nullptr);
+
+ ALOGD_IF(!mAngleNamespace, "Could not create ANGLE namespace from default");
return mAngleNamespace;
}