commit 6d082efa9a47ea4567d68f0573c34d72453e423f
author Cody Northrop <cnorthrop@google.com> Tue Sep 11 09:42:31 2018 -0600
committer Cody Northrop <cnorthrop@google.com> Thu Oct 18 07:24:25 2018 -0600
tree 4efee80a0f4f5be3f981bc39963ca9449275251c
parent 9a57d4e6664692837cfcceec919da16b729b29f8

Don't try to load ANGLE without a namespace

Now that we've moved to only loading ANGLE from a namespace,
don't try to load it if the namespace isn't present, which
happens for many early apps during startup.

Bug: 80239516
Test: Manual, check log for spurious loads, ANGLE still works
Test: cts-tradefed run singleCommand cts -m CtsAngleIntegrationHostTestCases
Change-Id: I03ae3475070c4a1c0cab5fdaa8605ef274065721
(cherry picked from commit 56ccdeb7fb2b3a19f8c87031e306441ccd54f5dc)

opengl/libs/EGL/Loader.cpp

diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 31712fc..cceaa8e 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -511,7 +511,7 @@
     return ANGLE_NO_PREFERENCE;
 }
 
-static void* load_angle(const char* kind, egl_connection_t* cnx) {
+static void* load_angle(const char* kind, android_namespace_t* ns, egl_connection_t* cnx) {
     // Only attempt to load ANGLE libs
     if (strcmp(kind, "EGL") != 0 && strcmp(kind, "GLESv2") != 0 && strcmp(kind, "GLESv1_CM") != 0)
         return nullptr;
@@ -520,7 +520,6 @@
     std::string name;
     char prop[PROPERTY_VALUE_MAX];
 
-    android_namespace_t* ns = android_getAngleNamespace();
     const char* app_name = android_getAngleAppName();
     const char* app_pref = android_getAngleAppPref();
     bool developer_opt_in = android_getAngleDeveloperOptIn();
@@ -620,7 +619,10 @@
     ATRACE_CALL();
 
     void* dso = nullptr;
-    dso = load_angle(kind, cnx);
+    android_namespace_t* ns = android_getAngleNamespace();
+    if (ns) {
+        dso = load_angle(kind, ns, cnx);
+    }
 #ifndef __ANDROID_VNDK__
     if (!dso) {
         android_namespace_t* ns = android_getDriverNamespace();