lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 17:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Look for new android getClassLoader function signature. Refs #1294

Browse Source
This commit is contained in:
baldurk
2019-03-04 11:03:42 +00:00
parent 4f4645d437
commit d5a9b15927
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/jdwp.cpp
+34 -17
View File
@@ -170,28 +170,45 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
if(vulkanLoaderClass)
{
// See:
// https://android.googlesource.com/platform/frameworks/base/+/f9419f0f8524da4980726e06130a80e0fb226763/core/java/android/app/ApplicationLoaders.java
// https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/app/ApplicationLoaders.java
// for the public getClassLoader.
// look for both signatures in this order, note that the final "String classLoaderName" was
// added recently
// look for both signatures in this order, as it goes from most recent to least recent. In some
// cases (e.g. with List<ClassLoader> sharedLibraries) the older function is still around as an
// overload that forwards on - so may not be called. This would cause us to wait for a function
// to be hit that was never hit.
// ClassLoader getClassLoader(String zip, int targetSdkVersion, boolean isBundled,
// String librarySearchPath, String libraryPermittedPath,
// ClassLoader parent);
methodID vulkanLoaderMethod = conn.GetMethod(
vulkanLoaderClass, "getClassLoader",
const char *getClassLoaderSignatures[] = {
// ClassLoader getClassLoader(String zip, int targetSdkVersion, boolean isBundled,
// String librarySearchPath, String libraryPermittedPath,
// ClassLoader parent, String cacheKey,
// String classLoaderName, List<ClassLoader> sharedLibraries);
"(Ljava/lang/String;IZLjava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;"
"Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)Ljava/lang/ClassLoader;",
// ClassLoader getClassLoader(String zip, int targetSdkVersion, boolean isBundled,
// String librarySearchPath, String libraryPermittedPath,
// ClassLoader parent, String classLoaderName);
"(Ljava/lang/String;IZLjava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;"
"Ljava/lang/String;)Ljava/lang/ClassLoader;",
// ClassLoader getClassLoader(String zip, int targetSdkVersion, boolean isBundled,
// String librarySearchPath, String libraryPermittedPath,
// ClassLoader parent);
"(Ljava/lang/String;IZLjava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)"
"Ljava/lang/ClassLoader;");
"Ljava/lang/ClassLoader;",
};
// ClassLoader getClassLoader(String zip, int targetSdkVersion, boolean isBundled,
// String librarySearchPath, String libraryPermittedPath,
// ClassLoader parent, String classLoaderName);
if(vulkanLoaderMethod == 0)
vulkanLoaderMethod = conn.GetMethod(
vulkanLoaderClass, "getClassLoader",
"(Ljava/lang/String;IZLjava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;"
"Ljava/lang/String;)Ljava/lang/ClassLoader;");
methodID vulkanLoaderMethod = 0;
for(const char *sig : getClassLoaderSignatures)
{
vulkanLoaderMethod = conn.GetMethod(vulkanLoaderClass, "getClassLoader", sig);
if(vulkanLoaderMethod)
{
RDCLOG("Got android.app.ApplicationLoaders.getClassLoader signature %s", sig);
}
}
if(vulkanLoaderMethod)
{