Add newer android setLayerPaths pattern (changed from const std::string to const std::string&) #126

Author: leegao

src/vulkan/wrapper/graphics_env_hooks.cpp

@@ -23,16 +23,29 @@ bool set_layer_paths() {
         LAYER_ERROR("Cannot open libgraphicsenv.so");
     }
 
-    #define FIND(var, sig, name) auto var = sig (dlsym(handle, name)); \
+    #define FIND(var, sig, name) var = sig (dlsym(handle, name)); \
         if (!var) { \
             LAYER_ERROR("Cannot find symbol in libgraphicsenv.so: " #name); \
         } \
         WLOGD("Found " #name " in libgraphicsenv.so at %p", var);
 
-    FIND(getInstance, (void* (*)()), "_ZN7android11GraphicsEnv11getInstanceEv");
-    FIND(getLayerPaths, (const std::string&(*)(void*)), "_ZN7android11GraphicsEnv13getLayerPathsEv");
-    FIND(getAppNamespace, (void* (*)(void*)), "_ZN7android11GraphicsEnv15getAppNamespaceEv");
-    FIND(setLayerPaths, (void (*)(void*, void*, const std::string)), "_ZN7android11GraphicsEnv13setLayerPathsEPNS_21NativeLoaderNamespaceENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE");
+    #define FIND2(var, sig, name) var = sig (dlsym(handle, name)); \
+        if (!var) { \
+            WLOGD("Cannot find " #name " in libgraphicsenv.so"); \
+        } else { \
+            WLOGD("Found " #name " in libgraphicsenv.so at %p", var); \
+        }
+
+    auto FIND(getInstance, (void* (*)()), "_ZN7android11GraphicsEnv11getInstanceEv");
+    auto FIND(getLayerPaths, (const std::string&(*)(void*)), "_ZN7android11GraphicsEnv13getLayerPathsEv");
+    auto FIND(getAppNamespace, (void* (*)(void*)), "_ZN7android11GraphicsEnv15getAppNamespaceEv");
+    auto FIND2(setLayerPaths, (void (*)(void*, void*, const std::string)), "_ZN7android11GraphicsEnv13setLayerPathsEPNS_21NativeLoaderNamespaceENSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE");
+    // Later versions of Android uses this signature instead
+    auto FIND2(setLayerPaths2, (void (*)(void*, void*, const std::string&)), "_ZN7android11GraphicsEnv13setLayerPathsEPNS_21NativeLoaderNamespaceERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE");
+
+    if (!setLayerPaths && !setLayerPaths2) {
+        LAYER_ERROR("Could not find android::GraphicsEnv::setLayerPaths(android::NativeLoaderNamespace*, const std::string[&])");
+    }
 
     void* instance = getInstance();
     if (!instance) {
@@ -49,7 +62,11 @@ bool set_layer_paths() {
         LAYER_ERROR("GraphicsEnv::mLayerPaths is already set to %s, cannot perform hijacking", path.c_str());
     }
     void* app_namespace = getAppNamespace(instance);
-    setLayerPaths(instance, app_namespace, PATH);
+    if (setLayerPaths) {
+        setLayerPaths(instance, app_namespace, PATH);
+    } else {
+        setLayerPaths2(instance, app_namespace, PATH);
+    }
     path = getLayerPaths(instance);
     if (path != PATH) {
         LAYER_ERROR("GraphicsEnv::mLayerPaths failed to be set correctly, found %s", path.c_str());